Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f2618e1c2b934ed7c67956ec5597753ca198a4d1..ccb0c1fdf1b5de0c6beeb37f53c36f0430ba70da 100644 (file)
--- 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
@@ -97,7 +101,7 @@ config DEBUG_PREEMPT
 
 config DEBUG_MUTEXES
        bool "Mutex debugging, deadlock detection"
-       default y
+       default n
        depends on DEBUG_KERNEL
        help
         This allows mutex semantics violations and mutex related deadlocks
@@ -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
@@ -198,8 +189,7 @@ config FRAME_POINTER
 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
+       depends on !MODULES || !(MIPS || PARISC || PPC || SUPERH || 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.