Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-drm-fsl-dcu.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 094f3152ec2bf318dfe82797baede3b516cbd527..db25707aa41bc021b8174391091178b85258d466 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -312,6 +312,15 @@ config MAGIC_SYSRQ
          keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
          unless you really know what this hack does.
 
+config MAGIC_SYSRQ_DEFAULT_ENABLE
+       hex "Enable magic SysRq key functions by default"
+       depends on MAGIC_SYSRQ
+       default 0x1
+       help
+         Specifies which SysRq key functions are enabled by default.
+         This may be set to 1 or 0 to enable or disable them all, or
+         to a bitmask as described in Documentation/sysrq.txt.
+
 config DEBUG_KERNEL
        bool "Kernel debugging"
        help
@@ -1472,6 +1481,15 @@ config INTERVAL_TREE_TEST
        help
          A benchmark measuring the performance of the interval tree library
 
+config PERCPU_TEST
+       tristate "Per cpu operations test"
+       depends on m && DEBUG_KERNEL
+       help
+         Enable this option to build test module which validates per-cpu
+         operations.
+
+         If unsure, say N.
+
 config ATOMIC64_SELFTEST
        bool "Perform an atomic64_t self-test at boot"
        help