diff options
| author | James Morris <jmorris@namei.org> | 2008-09-05 23:25:51 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-05 23:26:46 +1000 |
| commit | f0ca2eee6236719836ddc41bba1a9bc511a0df57 (patch) | |
| tree | 4430b7a768eef665209d5e2798902a60a4c89f83 /lib | |
| parent | 62a7a8c794d46d2159aa3e7458dfaeedafeb6feb (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'master' into next-creds-subsys
Conflicts:
drivers/net/wan/sbni.c
Signed-off-by: James Morris <jmorris@namei.org>
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 bool depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT select STACKTRACE - select FRAME_POINTER if !X86 && !MIPS + select FRAME_POINTER if !X86 && !MIPS && !PPC select KALLSYMS select KALLSYMS_ALL @@ -676,13 +676,13 @@ config FAULT_INJECTION_STACKTRACE_FILTER depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT depends on !X86_64 select STACKTRACE - select FRAME_POINTER + select FRAME_POINTER if !PPC help Provide stacktrace filter for fault-injection capabilities config LATENCYTOP bool "Latency measuring infrastructure" - select FRAME_POINTER if !MIPS + select FRAME_POINTER if !MIPS && !PPC select KALLSYMS select KALLSYMS_ALL select STACKTRACE |