svn commit: r323008 - in head/sys: dev/e1000 net
Ryan Libby
rlibby at gmail.com
Wed Aug 30 00:50:00 UTC 2017
On Tue, Aug 29, 2017 at 5:20 PM, Sean Bruno <sbruno at freebsd.org> wrote:
> Author: sbruno
> Date: Wed Aug 30 00:20:43 2017
> New Revision: 323008
> URL: https://svnweb.freebsd.org/changeset/base/323008
>
> Log:
> Continuation of lock cleanup in e1000.
>
> Post-cold sleep instead of DELAY when waiting for firmware.
>
> Convert softc mutex to an SX lock. Change all waits to sleeps
> once interrupts are enabled (and it is safe to sleep).
>
> Submitted by: Matt Macy <matt at mattmacy.io>
> Sponsored by: Limelight Networks
> Differential Revision: https://reviews.freebsd.org/D12101
>
> Modified:
> head/sys/dev/e1000/e1000_80003es2lan.c
> head/sys/dev/e1000/e1000_82571.c
> head/sys/dev/e1000/e1000_82575.c
> head/sys/dev/e1000/e1000_hw.h
> head/sys/dev/e1000/e1000_i210.c
> head/sys/dev/e1000/e1000_i210.h
> head/sys/dev/e1000/e1000_ich8lan.c
> head/sys/dev/e1000/e1000_mac.c
> head/sys/dev/e1000/e1000_mac.h
> head/sys/dev/e1000/e1000_osdep.h
> head/sys/dev/e1000/if_em.c
> head/sys/net/iflib.c
> head/sys/net/iflib.h
>
This broke the sparc64 [1] and other gcc builds with a -Wredundant-decls:
> /usr/src/sys/dev/e1000/e1000_osdep.h:81: warning: redundant redeclaration of 'cold' [-Wredundant-decls]
> /usr/src/sys/sys/systm.h:50: warning: previous declaration of 'cold' was here
e1000_osdep.h already #includes <sys/systm.h> so I think the extra
extern int cold; can just be deleted.
[1] https://ci.freebsd.org/job/FreeBSD-head-sparc64-build/2801/
More information about the svn-src-all
mailing list