diff --git a/[refs] b/[refs]
index cbad2b018d7c..deac3caa5b56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 567b56508f7367e161d6d861ef214a900ab45ce9
+refs/heads/master: 37fce857bec00d26d0e8251c909da2bd8736c949
diff --git a/trunk/arch/um/Kconfig.debug b/trunk/arch/um/Kconfig.debug
index b89989de364d..bd41e4286d0d 100644
--- a/trunk/arch/um/Kconfig.debug
+++ b/trunk/arch/um/Kconfig.debug
@@ -2,10 +2,6 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
-config FRAME_POINTER
-	bool
-	default y if DEBUG_INFO
-
 config PT_PROXY
 	bool "Enable ptrace proxy"
 	depends on XTERM_CHAN && DEBUG_INFO && MODE_TT
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index ac23847ce0e3..0c421295e613 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -151,7 +151,8 @@ config DEBUG_FS
 
 config FRAME_POINTER
 	bool "Compile the kernel with frame pointers"
-	depends on DEBUG_KERNEL && ((X86 && !X86_64) || CRIS || M68K || M68KNOMMU || FRV)
+	depends on DEBUG_KERNEL && ((X86 && !X86_64) || CRIS || M68K || M68KNOMMU || FRV || UML)
+	default y if DEBUG_INFO && UML
 	help
 	  If you say Y here the resulting kernel image will be slightly larger
 	  and slower, but it will give very useful debugging information.