1 files changed, 16 insertions, 15 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a314e663d517..d57fd9181b18 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -78,13 +78,17 @@ config SCHEDSTATS
           this adds.
 
 config DEBUG_SLAB
-        bool "Debug memory allocations"
+        bool "Debug slab memory allocations"
         depends on DEBUG_KERNEL && SLAB
         help
           Say Y here to have the kernel do limited verification on memory
           allocation as well as poisoning memory on free to catch use of freed
           memory. This can make kmalloc/kfree-intensive workloads much slower.
 
+config DEBUG_SLAB_LEAK
+        bool "Memory leak debugging"
+        depends on DEBUG_SLAB
+
 config DEBUG_PREEMPT
         bool "Debug preemptible kernel"
         depends on DEBUG_KERNEL && PREEMPT
@@ -153,22 +157,9 @@ config DEBUG_INFO
 
           If unsure, say N.
 
-config DEBUG_IOREMAP
-        bool "Enable ioremap() debugging"
-        depends on DEBUG_KERNEL && PARISC
-        help
-          Enabling this option will cause the kernel to distinguish between
-          ioremapped and physical addresses.  It will print a backtrace (at
-          most one every 10 seconds), hopefully allowing you to see which
-          drivers need work.  Fixing all these problems is a prerequisite
-          for turning on USE_HPPA_IOREMAP.  The warnings are harmless;
-          the kernel has enough information to fix the broken drivers
-          automatically, but we'd like to make it more efficient by not
-          having to do that.
-
 config DEBUG_FS
         bool "Debug Filesystem"
-        depends on DEBUG_KERNEL && SYSFS
+        depends on SYSFS
         help
           debugfs is a virtual file system that kernel developers use to put
           debugging files into.  Enable this option to be able to read and
@@ -195,6 +186,16 @@ 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)
+        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