1 files changed, 31 insertions, 5 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6f440d82b58d..df9234c5f9d1 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -9,6 +9,17 @@ config PRINTK_TIME
           operations.  This is useful for identifying long delays
           in kernel startup.
 
+config DEFAULT_MESSAGE_LOGLEVEL
+        int "Default message log level (1-7)"
+        range 1 7
+        default "4"
+        help
+          Default log level for printk statements with no specified priority.
+
+          This was hard-coded to KERN_WARNING since at least 2.6.10 but folks
+          that are auditing their logs closely may want to set it to a lower
+          priority.
+
 config ENABLE_WARN_DEPRECATED
         bool "Enable __deprecated logic"
         default y
@@ -102,11 +113,6 @@ config HEADERS_CHECK
 
 config DEBUG_SECTION_MISMATCH
         bool "Enable full Section mismatch analysis"
-        depends on UNDEFINED || (BLACKFIN)
-        default y
-        # This option is on purpose disabled for now.
-        # It will be enabled when we are down to a reasonable number
-        # of section mismatch warnings (< 10 for an allyesconfig build)
         help
           The section mismatch analysis checks if there are illegal
           references from one section to another section.
@@ -176,6 +182,23 @@ config HARDLOCKUP_DETECTOR
         def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \
                  !ARCH_HAS_NMI_WATCHDOG
 
+config BOOTPARAM_HARDLOCKUP_PANIC
+        bool "Panic (Reboot) On Hard Lockups"
+        depends on LOCKUP_DETECTOR
+        help
+          Say Y here to enable the kernel to panic on "hard lockups",
+          which are bugs that cause the kernel to loop in kernel
+          mode with interrupts disabled for more than 60 seconds.
+
+          Say N if unsure.
+
+config BOOTPARAM_HARDLOCKUP_PANIC_VALUE
+        int
+        depends on LOCKUP_DETECTOR
+        range 0 1
+        default 0 if !BOOTPARAM_HARDLOCKUP_PANIC
+        default 1 if BOOTPARAM_HARDLOCKUP_PANIC
+
 config BOOTPARAM_SOFTLOCKUP_PANIC
         bool "Panic (Reboot) On Soft Lockups"
         depends on LOCKUP_DETECTOR
@@ -1227,3 +1250,6 @@ source "samples/Kconfig"
 source "lib/Kconfig.kgdb"
 
 source "lib/Kconfig.kmemcheck"
+
+config TEST_KSTRTOX
+        tristate "Test kstrto*() family of functions at runtime"