Remove KTR_GIANT_CONTENTION kernel option (no longer used).

diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index eba9f00..805edfe 100644 (file)
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/ktr.4
@@ -37,7 +37,6 @@
 .Cd options KTR_VERBOSE=1
 .Cd options KTR_ALL
 .Cd options KTR_ETHERNET
-.Cd options KTR_GIANT_CONTENTION
 .Cd options KTR_IF_BGE
 .Cd options KTR_IF_EM
 .Cd options KTR_IF_START
@@ -76,7 +75,7 @@ By default the buffer contains 2048 entries.
 For debugging purposes, the following
 .Nm
 related kernel options exist:
-.Bl -tag -width ".Dv KTR_GIANT_CONTENTION"
+.Bl -tag -width ".Dv KTR_SPIN_CONTENTION"
 .It Dv KTR_ALL
 turns on all options
 .It Dv KTR_ETHERNET
@@ -84,8 +83,6 @@ cost of
 .Fn ether_input_chain
 and
 .Fn ether_input_dispatch
-.It Dv KTR_GIANT_CONTENTION
-contention of the giant lock
 .It Dv KTR_IF_BGE
 .Xr bge 4
 interrupts and sent/received packets

diff --git a/sys/conf/options b/sys/conf/options
index c2a0596..5d9d89b 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -601,7 +601,6 @@ KTR_IPIQ                    opt_ktr.h
 KTR_MSGPORT                    opt_ktr.h
 KTR_ENTRIES                    opt_global.h
 KTR_VERBOSE                    opt_ktr.h
-KTR_GIANT_CONTENTION           opt_ktr.h
 KTR_SPIN_CONTENTION            opt_ktr.h
 KTR_IF_BGE                     opt_ktr.h
 KTR_IF_EM                      opt_ktr.h

diff --git a/sys/config/LINT b/sys/config/LINT
index 414aa35..755d2c2 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2887,7 +2887,6 @@ options   XBONEHACK
 options        KTR
 #options KTR_CTXSW
 #options KTR_ETHERNET
-#options KTR_GIANT_CONTENTION
 #options KTR_HAMMER
 #options KTR_IF_BGE
 #options KTR_IF_EM

diff --git a/sys/config/VKERNEL b/sys/config/VKERNEL
index 7f7f980..0bde823 100644 (file)
--- a/sys/config/VKERNEL
+++ b/sys/config/VKERNEL
@@ -14,7 +14,6 @@ cpu           I686_CPU
 options                DEBUG_PCTRACK
 
 options                KTR
-options                KTR_GIANT_CONTENTION
 options                KTR_SPIN_CONTENTION
 #options       DEBUG_CRIT_SECTIONS
 

diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64
index c5aeb76..fd2493d 100644 (file)
--- a/sys/config/VKERNEL64
+++ b/sys/config/VKERNEL64
@@ -13,7 +13,6 @@ cpu           HAMMER_CPU
 options                DEBUG_PCTRACK
 
 ##options              KTR
-##options              KTR_GIANT_CONTENTION
 ##options              KTR_SPIN_CONTENTION
 #options       DEBUG_CRIT_SECTIONS