1 files changed, 116 insertions, 1 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0b504814e378..b0f239e443bc 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -495,6 +495,15 @@ config DEBUG_VM
 
           If unsure, say N.
 
+config DEBUG_VIRTUAL
+        bool "Debug VM translations"
+        depends on DEBUG_KERNEL && X86
+        help
+          Enable some costly sanity checks in virtual to page code. This can
+          catch mistakes with virt_to_page() and friends.
+
+          If unsure, say N.
+
 config DEBUG_WRITECOUNT
         bool "Debug filesystem writers count"
         depends on DEBUG_KERNEL
@@ -597,6 +606,19 @@ config RCU_TORTURE_TEST_RUNNABLE
           Say N here if you want the RCU torture tests to start only
           after being manually enabled via /proc.
 
+config RCU_CPU_STALL_DETECTOR
+        bool "Check for stalled CPUs delaying RCU grace periods"
+        depends on CLASSIC_RCU
+        default n
+        help
+          This option causes RCU to printk information on which
+          CPUs are delaying the current grace period, but only when
+          the grace period extends for excessive time periods.
+
+          Say Y if you want RCU to perform such checks.
+
+          Say N if you are unsure.
+
 config KPROBES_SANITY_TEST
         bool "Kprobes sanity tests"
         depends on DEBUG_KERNEL
@@ -624,6 +646,33 @@ config BACKTRACE_SELF_TEST
 
           Say N if you are unsure.
 
+config DEBUG_BLOCK_EXT_DEVT
+        bool "Force extended block device numbers and spread them"
+        depends on DEBUG_KERNEL
+        depends on BLOCK
+        default n
+        help
+          BIG FAT WARNING: ENABLING THIS OPTION MIGHT BREAK BOOTING ON
+          SOME DISTRIBUTIONS.  DO NOT ENABLE THIS UNLESS YOU KNOW WHAT
+          YOU ARE DOING.  Distros, please enable this and fix whatever
+          is broken.
+
+          Conventionally, block device numbers are allocated from
+          predetermined contiguous area.  However, extended block area
+          may introduce non-contiguous block device numbers.  This
+          option forces most block device numbers to be allocated from
+          the extended space and spreads them to discover kernel or
+          userland code paths which assume predetermined contiguous
+          device number allocation.
+
+          Note that turning on this debug option shuffles all the
+          device numbers for all IDE and SCSI devices including libata
+          ones, so root partition specified using device number
+          directly (via rdev or root=MAJ:MIN) won't work anymore.
+          Textual device names (root=/dev/sdXn) will continue to work.
+
+          Say N if you are unsure.
+
 config LKDTM
         tristate "Linux Kernel Dump Test Tool Module"
         depends on DEBUG_KERNEL
@@ -661,10 +710,21 @@ config FAIL_PAGE_ALLOC
 
 config FAIL_MAKE_REQUEST
         bool "Fault-injection capability for disk IO"
-        depends on FAULT_INJECTION
+        depends on FAULT_INJECTION && BLOCK
         help
           Provide fault-injection capability for disk IO.
 
+config FAIL_IO_TIMEOUT
+        bool "Faul-injection capability for faking disk interrupts"
+        depends on FAULT_INJECTION && BLOCK
+        help
+          Provide fault-injection capability on end IO handling. This
+          will make the block layer "forget" an interrupt as configured,
+          thus exercising the error handling.
+
+          Only works with drivers that use the generic timeout handling,
+          for others it wont do anything.
+
 config FAULT_INJECTION_DEBUG_FS
         bool "Debugfs entries for fault-injection capabilities"
         depends on FAULT_INJECTION && SYSFS && DEBUG_FS
@@ -752,6 +812,61 @@ menuconfig BUILD_DOCSRC
 
           Say N if you are unsure.
 
+config DYNAMIC_PRINTK_DEBUG
+        bool "Enable dynamic printk() call support"
+        default n
+        depends on PRINTK
+        select PRINTK_DEBUG
+        help
+
+          Compiles debug level messages into the kernel, which would not
+          otherwise be available at runtime. These messages can then be
+          enabled/disabled on a per module basis. This mechanism implicitly
+          enables all pr_debug() and dev_dbg() calls. The impact of this
+          compile option is a larger kernel text size of about 2%.
+
+          Usage:
+
+          Dynamic debugging is controlled by the debugfs file,
+          dynamic_printk/modules. This file contains a list of the modules that
+          can be enabled. The format of the file is the module name, followed
+          by a set of flags that can be enabled. The first flag is always the
+          'enabled' flag. For example:
+
+                <module_name> <enabled=0/1>
+                                .
+                                .
+                                .
+
+          <module_name> : Name of the module in which the debug call resides
+          <enabled=0/1> : whether the messages are enabled or not
+
+          From a live system:
+
+                snd_hda_intel enabled=0
+                fixup enabled=0
+                driver enabled=0
+
+          Enable a module:
+
+                $echo "set enabled=1 <module_name>" > dynamic_printk/modules
+
+          Disable a module:
+
+                $echo "set enabled=0 <module_name>" > dynamic_printk/modules
+
+          Enable all modules:
+
+                $echo "set enabled=1 all" > dynamic_printk/modules
+
+          Disable all modules:
+
+                $echo "set enabled=0 all" > dynamic_printk/modules
+
+          Finally, passing "dynamic_printk" at the command line enables
+          debugging for all modules. This mode can be turned off via the above
+          disable command.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"