diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:00 +0200 |
commit | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (patch) | |
tree | 702dd6a7ce06d224d594c2293af546b11ac9f51b /arch/sparc64/Kconfig.debug | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
parent | ftrace: prevent ftrace modifications while being kprobe'd, v2 (diff) | |
download | linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.xz linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.zip |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'arch/sparc64/Kconfig.debug')
-rw-r--r-- | arch/sparc64/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug index 6a4d28a4076d..d6d32d178fc8 100644 --- a/arch/sparc64/Kconfig.debug +++ b/arch/sparc64/Kconfig.debug @@ -33,7 +33,7 @@ config DEBUG_PAGEALLOC config MCOUNT bool - depends on STACK_DEBUG + depends on STACK_DEBUG || FTRACE default y config FRAME_POINTER |