diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 15:04:04 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 15:04:04 -0400 |
commit | 8040d77688014987ca5738bf1731db72ab273441 (patch) | |
tree | 99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /lib | |
parent | fb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff) | |
parent | 268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff) |
Merge branch 'core/resources' into x86/core
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig.debug | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 8b5a7d304a5f..0b504814e378 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -394,7 +394,7 @@ config LOCKDEP | |||
394 | bool | 394 | bool |
395 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | 395 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |
396 | select STACKTRACE | 396 | select STACKTRACE |
397 | select FRAME_POINTER if !X86 && !MIPS | 397 | select FRAME_POINTER if !X86 && !MIPS && !PPC |
398 | select KALLSYMS | 398 | select KALLSYMS |
399 | select KALLSYMS_ALL | 399 | select KALLSYMS_ALL |
400 | 400 | ||
@@ -676,13 +676,13 @@ config FAULT_INJECTION_STACKTRACE_FILTER | |||
676 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT | 676 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT |
677 | depends on !X86_64 | 677 | depends on !X86_64 |
678 | select STACKTRACE | 678 | select STACKTRACE |
679 | select FRAME_POINTER | 679 | select FRAME_POINTER if !PPC |
680 | help | 680 | help |
681 | Provide stacktrace filter for fault-injection capabilities | 681 | Provide stacktrace filter for fault-injection capabilities |
682 | 682 | ||
683 | config LATENCYTOP | 683 | config LATENCYTOP |
684 | bool "Latency measuring infrastructure" | 684 | bool "Latency measuring infrastructure" |
685 | select FRAME_POINTER if !MIPS | 685 | select FRAME_POINTER if !MIPS && !PPC |
686 | select KALLSYMS | 686 | select KALLSYMS |
687 | select KALLSYMS_ALL | 687 | select KALLSYMS_ALL |
688 | select STACKTRACE | 688 | select STACKTRACE |