From: Sascha Wildner <saw@online.de>
Date: Sun, 18 Nov 2012 21:34:36 +0000 (+0100)
Subject: kernel: Remove unused KTR_POLLING option.
X-Git-Tag: v3.4.0rc~826
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1c297ed0a4786bac345a8193fb9e58601eb20b09

kernel: Remove unused KTR_POLLING option.
---

diff --git a/UPDATING b/UPDATING
index 37532ff0e2..2d4fa20627 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,13 +12,16 @@
 +         UPGRADING DRAGONFLY FROM 3.3 to later versions                +
 +-----------------------------------------------------------------------+
 
-DEVICE_POLLING OPTION REPLACED BY IFPOLL_ENABLE OPTION
-------------------
+DEVICE_POLLING OPTION REPLACED BY IFPOLL_ENABLE OPTION, KTR_POLLING REMOVED
+---------------------------------------------------------------------------
 
 The DEVICE_POLLING kernel option has been made a no-op and it has been
 replaced by IFPOLL_ENABLE.  If you have 'options DEVICE_POLLING' in your
 kernel config, you need to change it to IFPOLL_ENABLE.
 
+Also, the KTR_POLLING kernel option has been removed, so it must be
+removed from kernel configs that have it.
+
 +-----------------------------------------------------------------------+
 +         UPGRADING DRAGONFLY FROM 3.2 to later versions                +
 +-----------------------------------------------------------------------+
diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index 414510ff04..99133658b3 100644
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/ktr.4
@@ -47,7 +47,6 @@
 .Cd options KTR_IPIQ
 .Cd options KTR_KERNENTRY
 .Cd options KTR_MEMORY
-.Cd options KTR_POLLING
 .Cd options KTR_SERIALIZER
 .Cd options KTR_SPIN_CONTENTION
 .\".Cd options KTR_TCP
@@ -116,9 +115,6 @@ entry of the kernel from userland (faults, syscalls)
 and
 .Xr kfree 9
 events
-.It Dv KTR_POLLING
-.Xr polling 4
-begins and ends
 .It Dv KTR_SERIALIZER
 .Xr serializer 9
 related events
diff --git a/sys/conf/options b/sys/conf/options
index af9a428f71..3bd0f8a82d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -591,7 +591,6 @@ KTR_IF_START			opt_ktr.h
 KTR_IPIQ			opt_ktr.h
 KTR_KERNENTRY			opt_ktr.h
 KTR_MEMORY			opt_ktr.h
-KTR_POLLING			opt_ktr.h
 KTR_SERIALIZER			opt_ktr.h
 KTR_SPIN_CONTENTION		opt_ktr.h
 KTR_TESTLOG			opt_ktr.h
diff --git a/sys/config/LINT b/sys/config/LINT
index 966fb0e2ea..8e109efffa 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2557,7 +2557,6 @@ options	KTR_VERBOSE=1
 #options KTR_IPIQ
 #options KTR_KERNENTRY
 #options KTR_MEMORY
-#options KTR_POLLING
 #options KTR_SERIALIZER
 #options KTR_SPIN_CONTENTION
 #options KTR_TESTLOG
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 0e71f493bb..ba5315b6a7 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -2320,7 +2320,6 @@ options	KTR_VERBOSE=1
 #options KTR_IPIQ
 #options KTR_KERNENTRY
 #options KTR_MEMORY
-#options KTR_POLLING
 #options KTR_SERIALIZER
 #options KTR_SPIN_CONTENTION
 #options KTR_TESTLOG