Explorar o código

[PATCH] let the the lockdep options depend on DEBUG_KERNEL

The lockdep options should depend on DEBUG_KERNEL since:
- they are kernel debugging options and
- they do otherwise break the DEBUG_KERNEL menu structure

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Adrian Bunk %!s(int64=19) %!d(string=hai) anos
pai
achega
517e7aa5b0
Modificáronse 1 ficheiros con 6 adicións e 4 borrados
  1. 6 4
      lib/Kconfig.debug

+ 6 - 4
lib/Kconfig.debug

@@ -158,7 +158,7 @@ config DEBUG_RWSEMS
 
 
 config DEBUG_LOCK_ALLOC
 config DEBUG_LOCK_ALLOC
 	bool "Lock debugging: detect incorrect freeing of live locks"
 	bool "Lock debugging: detect incorrect freeing of live locks"
-	depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
+	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
 	select DEBUG_SPINLOCK
 	select DEBUG_SPINLOCK
 	select DEBUG_MUTEXES
 	select DEBUG_MUTEXES
 	select DEBUG_RWSEMS
 	select DEBUG_RWSEMS
@@ -173,7 +173,7 @@ config DEBUG_LOCK_ALLOC
 
 
 config PROVE_LOCKING
 config PROVE_LOCKING
 	bool "Lock debugging: prove locking correctness"
 	bool "Lock debugging: prove locking correctness"
-	depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
+	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
 	select LOCKDEP
 	select LOCKDEP
 	select DEBUG_SPINLOCK
 	select DEBUG_SPINLOCK
 	select DEBUG_MUTEXES
 	select DEBUG_MUTEXES
@@ -216,7 +216,7 @@ config PROVE_LOCKING
 
 
 config LOCKDEP
 config LOCKDEP
 	bool
 	bool
-	depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
+	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
 	select STACKTRACE
 	select STACKTRACE
 	select FRAME_POINTER
 	select FRAME_POINTER
 	select KALLSYMS
 	select KALLSYMS
@@ -224,13 +224,14 @@ config LOCKDEP
 
 
 config DEBUG_LOCKDEP
 config DEBUG_LOCKDEP
 	bool "Lock dependency engine debugging"
 	bool "Lock dependency engine debugging"
-	depends on LOCKDEP
+	depends on DEBUG_KERNEL && LOCKDEP
 	help
 	help
 	  If you say Y here, the lock dependency engine will do
 	  If you say Y here, the lock dependency engine will do
 	  additional runtime checks to debug itself, at the price
 	  additional runtime checks to debug itself, at the price
 	  of more runtime overhead.
 	  of more runtime overhead.
 
 
 config TRACE_IRQFLAGS
 config TRACE_IRQFLAGS
+	depends on DEBUG_KERNEL
 	bool
 	bool
 	default y
 	default y
 	depends on TRACE_IRQFLAGS_SUPPORT
 	depends on TRACE_IRQFLAGS_SUPPORT
@@ -256,6 +257,7 @@ config DEBUG_LOCKING_API_SELFTESTS
 
 
 config STACKTRACE
 config STACKTRACE
 	bool
 	bool
+	depends on DEBUG_KERNEL
 	depends on STACKTRACE_SUPPORT
 	depends on STACKTRACE_SUPPORT
 
 
 config DEBUG_KOBJECT
 config DEBUG_KOBJECT