diff --git a/[refs] b/[refs]
index ccb4b77d5902..fd56ac5c0ec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab7efcc97ebc92e03c0474dfd38f9c7b84b84115
+refs/heads/master: 604bf5a216e7f2d97cdf62614ca1281921531040
diff --git a/trunk/Makefile b/trunk/Makefile
index cb5790580fca..14781f36e327 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -517,6 +517,10 @@ else
 CFLAGS		+= -fomit-frame-pointer
 endif
 
+ifdef CONFIG_UNWIND_INFO
+CFLAGS		+= -fasynchronous-unwind-tables
+endif
+
 ifdef CONFIG_DEBUG_INFO
 CFLAGS		+= -g
 endif
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index a314e663d517..f2618e1c2b93 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -195,6 +195,17 @@ config FRAME_POINTER
 	  some architectures or if you use external debuggers.
 	  If you don't debug the kernel, you can say N.
 
+config UNWIND_INFO
+	bool "Compile the kernel with frame unwind information"
+	depends on !IA64
+	depends on !MODULES || !(MIPS || PARISC || PPC || SUPERH || SPARC64 || V850)
+	default DEBUG_KERNEL
+	help
+	  If you say Y here the resulting kernel image will be slightly larger
+	  but not slower, and it will give very useful debugging information.
+	  If you don't debug the kernel, you can say N, but we may not be able
+	  to solve problems without frame unwind information or frame pointers.
+
 config FORCED_INLINING
 	bool "Force gcc to inline functions marked 'inline'"
 	depends on DEBUG_KERNEL