1 files changed, 30 insertions, 8 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 80598cfd728c..a314e663d517 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -9,15 +9,9 @@ config PRINTK_TIME
           in kernel startup.
 
 
-config DEBUG_KERNEL
-        bool "Kernel debugging"
-        help
-          Say Y here if you are developing drivers or trying to debug and
-          identify kernel problems.
-
 config MAGIC_SYSRQ
         bool "Magic SysRq key"
-        depends on DEBUG_KERNEL && !UML
+        depends on !UML
         help
           If you say Y here, you will have some control over the system even
           if the system crashes for example during kernel debugging (e.g., you
@@ -29,6 +23,12 @@ config MAGIC_SYSRQ
           keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
           unless you really know what this hack does.
 
+config DEBUG_KERNEL
+        bool "Kernel debugging"
+        help
+          Say Y here if you are developing drivers or trying to debug and
+          identify kernel problems.
+
 config LOG_BUF_SHIFT
         int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
         range 12 21
@@ -79,7 +79,7 @@ config SCHEDSTATS
 
 config DEBUG_SLAB
         bool "Debug memory allocations"
-        depends on DEBUG_KERNEL
+        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
@@ -95,6 +95,14 @@ config DEBUG_PREEMPT
           if kernel code uses it in a preemption-unsafe way. Also, the kernel
           will detect preemption count underflows.
 
+config DEBUG_MUTEXES
+        bool "Mutex debugging, deadlock detection"
+        default y
+        depends on DEBUG_KERNEL
+        help
+         This allows mutex semantics violations and mutex related deadlocks
+         (lockups) to be detected and reported automatically.
+
 config DEBUG_SPINLOCK
         bool "Spinlock debugging"
         depends on DEBUG_KERNEL
@@ -187,6 +195,20 @@ config FRAME_POINTER
           some architectures or if you use external debuggers.
           If you don't debug the kernel, you can say N.
 
+config FORCED_INLINING
+        bool "Force gcc to inline functions marked 'inline'"
+        depends on DEBUG_KERNEL
+        default y
+        help
+          This option determines if the kernel forces gcc to inline the functions
+          developers have marked 'inline'. Doing so takes away freedom from gcc to
+          do what it thinks is best, which is desirable for the gcc 3.x series of
+          compilers. The gcc 4.x series have a rewritten inlining algorithm and
+          disabling this option will generate a smaller kernel there. Hopefully
+          this algorithm is so good that allowing gcc4 to make the decision can
+          become the default in the future, until then this option is there to
+          test gcc for this.
+
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL