Commit 517e7aa5b022f9dc486639c7689666663daee24f
Committed by
Linus Torvalds
1 parent
c3c36aa98f
Exists in
master
and in
4 other branches
[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>
Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff
lib/Kconfig.debug
... | ... | @@ -158,7 +158,7 @@ |
158 | 158 | |
159 | 159 | config DEBUG_LOCK_ALLOC |
160 | 160 | bool "Lock debugging: detect incorrect freeing of live locks" |
161 | - depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | |
161 | + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | |
162 | 162 | select DEBUG_SPINLOCK |
163 | 163 | select DEBUG_MUTEXES |
164 | 164 | select DEBUG_RWSEMS |
... | ... | @@ -173,7 +173,7 @@ |
173 | 173 | |
174 | 174 | config PROVE_LOCKING |
175 | 175 | bool "Lock debugging: prove locking correctness" |
176 | - depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | |
176 | + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | |
177 | 177 | select LOCKDEP |
178 | 178 | select DEBUG_SPINLOCK |
179 | 179 | select DEBUG_MUTEXES |
... | ... | @@ -216,7 +216,7 @@ |
216 | 216 | |
217 | 217 | config LOCKDEP |
218 | 218 | bool |
219 | - depends on TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | |
219 | + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | |
220 | 220 | select STACKTRACE |
221 | 221 | select FRAME_POINTER |
222 | 222 | select KALLSYMS |
223 | 223 | |
... | ... | @@ -224,13 +224,14 @@ |
224 | 224 | |
225 | 225 | config DEBUG_LOCKDEP |
226 | 226 | bool "Lock dependency engine debugging" |
227 | - depends on LOCKDEP | |
227 | + depends on DEBUG_KERNEL && LOCKDEP | |
228 | 228 | help |
229 | 229 | If you say Y here, the lock dependency engine will do |
230 | 230 | additional runtime checks to debug itself, at the price |
231 | 231 | of more runtime overhead. |
232 | 232 | |
233 | 233 | config TRACE_IRQFLAGS |
234 | + depends on DEBUG_KERNEL | |
234 | 235 | bool |
235 | 236 | default y |
236 | 237 | depends on TRACE_IRQFLAGS_SUPPORT |
... | ... | @@ -256,6 +257,7 @@ |
256 | 257 | |
257 | 258 | config STACKTRACE |
258 | 259 | bool |
260 | + depends on DEBUG_KERNEL | |
259 | 261 | depends on STACKTRACE_SUPPORT |
260 | 262 | |
261 | 263 | config DEBUG_KOBJECT |