1 files changed, 15 insertions, 12 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0796c1a090c0..95de3102bc87 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -211,7 +211,7 @@ config SLUB_DEBUG_ON
 config SLUB_STATS
         default n
         bool "Enable SLUB performance statistics"
-        depends on SLUB
+        depends on SLUB && SLUB_DEBUG && SYSFS
         help
           SLUB statistics are useful to debug SLUBs allocation behavior in
           order find ways to optimize the allocator. This should never be
@@ -265,16 +265,6 @@ config DEBUG_MUTEXES
          This feature allows mutex semantics violations to be detected and
          reported.
 
-config DEBUG_SEMAPHORE
-        bool "Semaphore debugging"
-        depends on DEBUG_KERNEL
-        depends on ALPHA || FRV
-        default n
-        help
-          If you say Y here then semaphore processing will issue lots of
-          verbose debugging messages.  If you suspect a semaphore problem or a
-          kernel hacker asks for this option then say Y.  Otherwise say N.
-
 config DEBUG_LOCK_ALLOC
         bool "Lock debugging: detect incorrect freeing of live locks"
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -593,7 +583,7 @@ config LATENCYTOP
           to find out which userspace is blocking on what kernel operations.
 
 config PROVIDE_OHCI1394_DMA_INIT
-        bool "Provide code for enabling DMA over FireWire early on boot"
+        bool "Remote debugging over FireWire early on boot"
         depends on PCI && X86
         help
           If you want to debug problems which hang or crash the kernel early
@@ -621,4 +611,17 @@ config PROVIDE_OHCI1394_DMA_INIT
 
           See Documentation/debugging-via-ohci1394.txt for more information.
 
+config FIREWIRE_OHCI_REMOTE_DMA
+        bool "Remote debugging over FireWire with firewire-ohci"
+        depends on FIREWIRE_OHCI
+        help
+          This option lets you use the FireWire bus for remote debugging
+          with help of the firewire-ohci driver. It enables unfiltered
+          remote DMA in firewire-ohci.
+          See Documentation/debugging-via-ohci1394.txt for more information.
+
+          If unsure, say N.
+
 source "samples/Kconfig"
+
+source "lib/Kconfig.kgdb"