Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 2fd0b99..494224a 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -23,7 +23,7 @@ config STRICT_DEVMEM
 config FRAME_POINTER
        bool
        depends on !THUMB2_KERNEL
-       default y if !ARM_UNWIND
+       default y if !ARM_UNWIND || FUNCTION_GRAPH_TRACER
        help
          If you say N here, the resulting kernel will be slightly smaller and
          faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,
@@ -31,7 +31,7 @@ config FRAME_POINTER
          reported is severely limited.
 
 config ARM_UNWIND
-       bool "Enable stack unwinding support"
+       bool "Enable stack unwinding support (EXPERIMENTAL)"
        depends on AEABI && EXPERIMENTAL
        default y
        help