- 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

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

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>

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>
 
 /*********************************************************************

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>

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>

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>

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>
 
 /*********************************************************************

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>

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>

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>

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>

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>

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"

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>

sys/net/netisr.c

@@ -27,6 +27,7 @@
  * $FreeBSD$
  */
 
+#include "opt_device_polling.h"
 #include "opt_net.h"
 
 #include <sys/param.h>

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>

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>

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>

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>

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>

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>

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>