1 files changed, 17 insertions, 6 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 192ee01a9ba2..a71fd941ade7 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -2,18 +2,29 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
-# RMK wants arm kernels compiled with frame pointers so hardwire this to y.
+# RMK wants arm kernels compiled with frame pointers or stack unwinding.
 # If you know what you are doing and are willing to live without stack
 # traces, you can get a slightly smaller kernel by setting this option to
 # n, but then RMK will have to kill you ;).
 config FRAME_POINTER
         bool
-        default y
+        default y if !ARM_UNWIND
         help
           If you say N here, the resulting kernel will be slightly smaller and
-          faster. However, when a problem occurs with the kernel, the
-          information that is reported is severely limited. Most people
-          should say Y here.
+          faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,
+          when a problem occurs with the kernel, the information that is
+          reported is severely limited.
+
+config ARM_UNWIND
+        bool "Enable stack unwinding support"
+        depends on AEABI && EXPERIMENTAL
+        default y
+        help
+          This option enables stack unwinding support in the kernel
+          using the information automatically generated by the
+          compiler. The resulting kernel image is slightly bigger but
+          the performance is not affected. Currently, this feature
+          only works with EABI compilers. If unsure say Y.
 
 config DEBUG_USER
         bool "Verbose user fault messages"
@@ -66,7 +77,7 @@ config DEBUG_ICEDCC
           Say Y here if you want the debug print routines to direct their
           output to the EmbeddedICE macrocell's DCC channel using
           co-processor 14. This is known to work on the ARM9 style ICE
-          channel.
+          channel and on the XScale with the PEEDI.
 
           It does include a timeout to ensure that the system does not
           totally freeze when there is nothing connected to read.