Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[mv-sheeva.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 39fc6ae173b9a5b3539c8e6ec6872d27815dbbc3..c567f219191d590116bcdd4498349d72e62ce612 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -294,6 +294,8 @@ config LOCK_STAT
        help
         This feature enables tracking lock contention points
 
        help
         This feature enables tracking lock contention points
 

+        For more details, see Documentation/lockstat.txt
+

 config DEBUG_LOCKDEP
        bool "Lock dependency engine debugging"
        depends on DEBUG_KERNEL && LOCKDEP
 config DEBUG_LOCKDEP
        bool "Lock dependency engine debugging"
        depends on DEBUG_KERNEL && LOCKDEP


@@ -411,6 +413,24 @@ config FORCED_INLINING
          become the default in the future, until then this option is there to
          test gcc for this.
 
          become the default in the future, until then this option is there to
          test gcc for this.
 

+config BOOT_PRINTK_DELAY
+       bool "Delay each boot printk message by N milliseconds"
+       depends on DEBUG_KERNEL && PRINTK && GENERIC_CALIBRATE_DELAY
+       help
+         This build option allows you to read kernel boot messages
+         by inserting a short delay after each one.  The delay is
+         specified in milliseconds on the kernel command line,
+         using "boot_delay=N".
+
+         It is likely that you would also need to use "lpj=M" to preset
+         the "loops per jiffie" value.
+         See a previous boot log for the "lpj" value to use for your
+         system, and then set "lpj=M" before setting "boot_delay=N".
+         NOTE:  Using this option may adversely affect SMP systems.
+         I.e., processors other than the first one may not boot up.
+         BOOT_PRINTK_DELAY also may cause DETECT_SOFTLOCKUP to detect
+         what it believes to be lockup conditions.
+

 config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL
 config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL


@@ -478,3 +498,5 @@ config FAULT_INJECTION_STACKTRACE_FILTER
        select FRAME_POINTER
        help
          Provide stacktrace filter for fault-injection capabilities
        select FRAME_POINTER
        help
          Provide stacktrace filter for fault-injection capabilities

+
+source "samples/Kconfig"