diff options
author | glebius <glebius@FreeBSD.org> | 2005-10-05 10:09:17 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2005-10-05 10:09:17 +0000 |
commit | 9efbae40b7fa46513867c684c25f98672c91fd76 (patch) | |
tree | 4da500a63f4294917b4cd16805f3184b105af0b7 /sys | |
parent | 5fec195dfbb74ae2282f3a20aeb2944fc966235b (diff) | |
download | FreeBSD-src-9efbae40b7fa46513867c684c25f98672c91fd76.zip FreeBSD-src-9efbae40b7fa46513867c684c25f98672c91fd76.tar.gz |
- Don't pollute opt_global.h with DEVICE_POLLING and introduce
opt_device_polling.h
- Include opt_device_polling.h into appropriate files.
- Embrace with HAVE_KERNEL_OPTION_HEADERS the include in the files that
can be compiled as loadable modules.
Reviewed by: bde
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/options | 4 | ||||
-rw-r--r-- | sys/dev/dc/if_dc.c | 4 | ||||
-rw-r--r-- | sys/dev/em/if_em.c | 4 | ||||
-rw-r--r-- | sys/dev/firewire/if_fwe.c | 3 | ||||
-rw-r--r-- | sys/dev/firewire/if_fwip.c | 3 | ||||
-rw-r--r-- | sys/dev/fxp/if_fxp.c | 4 | ||||
-rw-r--r-- | sys/dev/ixgb/if_ixgb.c | 4 | ||||
-rw-r--r-- | sys/dev/nge/if_nge.c | 4 | ||||
-rw-r--r-- | sys/dev/re/if_re.c | 4 | ||||
-rw-r--r-- | sys/dev/sf/if_sf.c | 4 | ||||
-rw-r--r-- | sys/dev/vge/if_vge.c | 4 | ||||
-rw-r--r-- | sys/dev/vr/if_vr.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_clock.c | 1 | ||||
-rw-r--r-- | sys/kern/kern_poll.c | 2 | ||||
-rw-r--r-- | sys/net/netisr.c | 1 | ||||
-rw-r--r-- | sys/pci/if_dc.c | 4 | ||||
-rw-r--r-- | sys/pci/if_rl.c | 4 | ||||
-rw-r--r-- | sys/pci/if_sf.c | 4 | ||||
-rw-r--r-- | sys/pci/if_sis.c | 4 | ||||
-rw-r--r-- | sys/pci/if_ste.c | 4 | ||||
-rw-r--r-- | sys/pci/if_vr.c | 4 | ||||
-rw-r--r-- | sys/pci/if_xl.c | 4 |
22 files changed, 75 insertions, 3 deletions
diff --git a/sys/conf/options b/sys/conf/options index b11aa09..f32c2d9 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -327,6 +327,7 @@ BOOTP_COMPAT opt_bootp.h BOOTP_NFSROOT opt_bootp.h BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h +DEVICE_POLLING DEV_PF opt_pf.h DEV_PFLOG opt_pf.h DEV_PFSYNC opt_pf.h @@ -632,9 +633,6 @@ BGE_FAKE_AUTONEG opt_bge.h # wi driver WI_SYMBOL_FIRMWARE opt_wi.h -# XXX bogusly global. -DEVICE_POLLING opt_global.h - SOCKBUF_DEBUG opt_global.h # options for ubsec driver diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index a6f4304..d4322d5 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -91,6 +91,10 @@ __FBSDID("$FreeBSD$"); * AX88140A doesn't support internal NWAY. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index 3b5db52..8e87a2a 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -33,6 +33,10 @@ POSSIBILITY OF SUCH DAMAGE. /*$FreeBSD$*/ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <dev/em/if_em.h> /********************************************************************* diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c index 1bf1bcd..83c57ac 100644 --- a/sys/dev/firewire/if_fwe.c +++ b/sys/dev/firewire/if_fwe.c @@ -34,7 +34,10 @@ * $FreeBSD$ */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c index b3fdda4..0d7e5fe 100644 --- a/sys/dev/firewire/if_fwip.c +++ b/sys/dev/firewire/if_fwip.c @@ -36,7 +36,10 @@ * $FreeBSD$ */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 133a96a..638c8df 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -34,6 +34,10 @@ __FBSDID("$FreeBSD$"); * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/endian.h> diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c index d273542..eb7d8be 100644 --- a/sys/dev/ixgb/if_ixgb.c +++ b/sys/dev/ixgb/if_ixgb.c @@ -33,6 +33,10 @@ POSSIBILITY OF SUCH DAMAGE. /*$FreeBSD$*/ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <dev/ixgb/if_ixgb.h> /********************************************************************* diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index e8a89ea..2a944cc 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -88,6 +88,10 @@ __FBSDID("$FreeBSD$"); * if the user selects an MTU larger than 8152 (8170 - 18). */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 72fff4e..820415d 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -108,6 +108,10 @@ __FBSDID("$FreeBSD$"); * driver is 7422 bytes. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 691a0f6..7b2538b 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -79,6 +79,10 @@ __FBSDID("$FreeBSD$"); * registers inside the 256-byte I/O window. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index 9101945..8219b89 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -80,6 +80,10 @@ __FBSDID("$FreeBSD$"); * and sample NICs for testing. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index b3c92ea..8f15b84 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -60,6 +60,10 @@ __FBSDID("$FreeBSD$"); * transmission. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 2194cba..bfcca44 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -37,6 +37,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_device_polling.h" #include "opt_hwpmc_hooks.h" #include "opt_ntp.h" #include "opt_watchdog.h" diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index 3418049..992116f 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -28,6 +28,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_device_polling.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 3ef16b8..cfa14ef 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -27,6 +27,7 @@ * $FreeBSD$ */ +#include "opt_device_polling.h" #include "opt_net.h" #include <sys/param.h> diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index a6f4304..d4322d5 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -91,6 +91,10 @@ __FBSDID("$FreeBSD$"); * AX88140A doesn't support internal NWAY. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index a35e999..eae31bc 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -83,6 +83,10 @@ __FBSDID("$FreeBSD$"); * to select which interface to use depending on the chip type. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c index 691a0f6..7b2538b 100644 --- a/sys/pci/if_sf.c +++ b/sys/pci/if_sf.c @@ -79,6 +79,10 @@ __FBSDID("$FreeBSD$"); * registers inside the 256-byte I/O window. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index c0417be..0068039 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -58,6 +58,10 @@ __FBSDID("$FreeBSD$"); * longword aligned. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index f80e676..02815b9 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -33,6 +33,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c index b3c92ea..8f15b84 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -60,6 +60,10 @@ __FBSDID("$FreeBSD$"); * transmission. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index e49997a..91ff05e 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -101,6 +101,10 @@ __FBSDID("$FreeBSD$"); * PCI-based NICs. */ +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> |