config: Remove device_polling from stock configures

diff --git a/sys/config/GENERIC b/sys/config/GENERIC
index 85892dd..1305773 100644 (file)
--- a/sys/config/GENERIC
+++ b/sys/config/GENERIC
@@ -35,8 +35,6 @@ options       PROCFS                  #Process filesystem
 #options       COMPAT_43               #Compatible with BSD 4.3
 options                COMPAT_DF12             #Compatible with DragonFly up to 1.2
 options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI
-options                DEVICE_POLLING          # Support mixed interrupt-polling
-                                       # handling of network device drivers
 options                IFPOLL_ENABLE           # Support mixed interrupt-polling
                                        # handling of network device drivers
 options        UCONSOLE                #Allow users to grab the console

diff --git a/sys/config/LINT b/sys/config/LINT
index 18afa38..966fb0e 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -658,15 +658,13 @@ options   ATM_UNI                 #UNI signalling manager
 device         hea                     #Efficient ENI-155p ATM PCI
 device         hfa                     #FORE PCA-200E ATM PCI
 
-# DEVICE_POLLING adds support for mixed interrupt-polling handling
+# IFPOLL_ENABLE adds support for mixed interrupt-polling handling
 # of network device drivers, which has significant benefits in terms
 # of robustness to overloads and responsivity, as well as permitting
 # accurate scheduling of the CPU time between kernel network processing
 # and other activities. The drawback is a moderate (up to 1/pollhz seconds)
 # potential increase in response times. See polling(4) for further details.
 #
-options         DEVICE_POLLING
-
 # IFPOLL_ENABLE adds hardware queues' based polling
 options                IFPOLL_ENABLE
 

diff --git a/sys/config/LINT64 b/sys/config/LINT64
index aa1975b..0e71f49 100644 (file)
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -514,15 +514,13 @@ options           DUMMYNET_DEBUG
 #device                hea                     #Efficient ENI-155p ATM PCI
 #device                hfa                     #FORE PCA-200E ATM PCI
 
-# DEVICE_POLLING adds support for mixed interrupt-polling handling
+# IFPOLL_ENABLE adds support for mixed interrupt-polling handling
 # of network device drivers, which has significant benefits in terms
 # of robustness to overloads and responsivity, as well as permitting
 # accurate scheduling of the CPU time between kernel network processing
 # and other activities. The drawback is a moderate (up to 1/pollhz seconds)
 # potential increase in response times. See polling(4) for further details.
 #
-options         DEVICE_POLLING
-
 # IFPOLL_ENABLE adds hardware queues' based polling
 options                IFPOLL_ENABLE
 

diff --git a/sys/config/SOEKRIS b/sys/config/SOEKRIS
index 182e871..b389f68 100644 (file)
--- a/sys/config/SOEKRIS
+++ b/sys/config/SOEKRIS
@@ -38,7 +38,7 @@ options       PROCFS                  #Process filesystem
 #options       COMPAT_43               #Compatible with BSD 4.3
 options        COMPAT_DF12
 options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI
-options                DEVICE_POLLING          # Support mixed interrupt-polling
+options                IFPOLL_ENABLE           # Support mixed interrupt-polling
                                        # handling of network device drivers
 options        UCONSOLE                #Allow users to grab the console
 options        USERCONFIG              #boot -c editor

diff --git a/sys/config/VKERNEL b/sys/config/VKERNEL
index 36d6206..a1461c8 100644 (file)
--- a/sys/config/VKERNEL
+++ b/sys/config/VKERNEL
@@ -56,8 +56,6 @@ options       CD9660                  #ISO 9660 Filesystem
 options        PROCFS                  #Process filesystem
 #options       COMPAT_43               #Compatible with BSD 4.3
 options        COMPAT_DF12             #Compatible with DragonFly 1.2 and earlier
-options                DEVICE_POLLING          # Support mixed interrupt-polling
-                                       # handling of network device drivers
 options        UCONSOLE                #Allow users to grab the console
 options        KTRACE                  #ktrace(1) support
 options        SYSVSHM                 #SYSV-style shared memory

diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64
index e02faaa..19ec0e2 100644 (file)
--- a/sys/config/VKERNEL64
+++ b/sys/config/VKERNEL64
@@ -55,8 +55,6 @@ options       CD9660                  #ISO 9660 Filesystem
 options        PROCFS                  #Process filesystem
 #options       COMPAT_43               #Compatible with BSD 4.3
 #options       COMPAT_DF12             #Compatible with DragonFly 1.2 and earlier
-options                DEVICE_POLLING          # Support mixed interrupt-polling
-                                       # handling of network device drivers
 options        UCONSOLE                #Allow users to grab the console
 options        KTRACE                  #ktrace(1) support
 options        SYSVSHM                 #SYSV-style shared memory

diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index f132db1..08ddb2b 100644 (file)
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -31,8 +31,6 @@ options       CD9660                  #ISO 9660 Filesystem
 options        PROCFS                  #Process filesystem
 #options       COMPAT_43               #Compatible with BSD 4.3
 options        SCSI_DELAY=5000         #Delay (in ms) before probing SCSI
-options                DEVICE_POLLING          # Support mixed interrupt-polling
-                                       # handling of network device drivers
 options                IFPOLL_ENABLE           # Support mixed interrupt-polling
                                        # handling of network device drivers
 options        UCONSOLE                #Allow users to grab the console