Merge tag 'docs-4.10' of git://git.lwn.net/linux

[mirror_ubuntu-zesty-kernel.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1a9fa51b693b3f64aed71ba04655f896cc7fa9ed..e6327d102184a8aa6ac443e69b0bb0a9ad6800f8 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -15,6 +15,21 @@ config PRINTK_TIME
          The behavior is also controlled by the kernel command line
          parameter printk.time=1. See Documentation/admin-guide/kernel-parameters.rst
 
+config CONSOLE_LOGLEVEL_DEFAULT
+       int "Default console loglevel (1-15)"
+       range 1 15
+       default "7"
+       help
+         Default loglevel to determine what will be printed on the console.
+
+         Setting a default here is equivalent to passing in loglevel=<x> in
+         the kernel bootargs. loglevel=<x> continues to override whatever
+         value is specified here as well.
+
+         Note: This does not affect the log level of un-prefixed prink()
+         usage in the kernel. That is controlled by the MESSAGE_LOGLEVEL_DEFAULT
+         option.
+
 config MESSAGE_LOGLEVEL_DEFAULT
        int "Default message log level (1-7)"
        range 1 7
@@ -26,6 +41,10 @@ config MESSAGE_LOGLEVEL_DEFAULT
          that are auditing their logs closely may want to set it to a lower
          priority.
 
+         Note: This does not affect what message level gets printed on the console
+         by default. To change that, use loglevel=<x> in the kernel bootargs,
+         or pick a different CONSOLE_LOGLEVEL_DEFAULT configuration value.
+
 config BOOT_PRINTK_DELAY
        bool "Delay each boot printk message by N milliseconds"
        depends on DEBUG_KERNEL && PRINTK && GENERIC_CALIBRATE_DELAY
@@ -1085,6 +1104,9 @@ config PROVE_LOCKING
 
         For more details, see Documentation/locking/lockdep-design.txt.
 
+config PROVE_LOCKING_SMALL
+       bool
+
 config LOCKDEP
        bool
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -1215,7 +1237,7 @@ config DEBUG_BUGVERBOSE
 
 config DEBUG_LIST
        bool "Debug linked list manipulation"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL || BUG_ON_DATA_CORRUPTION
        help
          Enable this to turn on extended checks in the linked-list
          walking routines.
@@ -1431,7 +1453,8 @@ config RCU_TRACE
        select TRACE_CLOCK
        help
          This option provides tracing in RCU which presents stats
-         in debugfs for debugging RCU implementation.
+         in debugfs for debugging RCU implementation.  It also enables
+         additional tracepoints for ftrace-style event tracing.
 
          Say Y here if you want to enable RCU tracing
          Say N if you are unsure.
@@ -1961,6 +1984,16 @@ config TEST_STATIC_KEYS
 
          If unsure, say N.
 
+config BUG_ON_DATA_CORRUPTION
+       bool "Trigger a BUG when data corruption is detected"
+       select DEBUG_LIST
+       help
+         Select this option if the kernel should BUG when it encounters
+         data corruption in kernel memory structures when they get checked
+         for validity.
+
+         If unsure, say N.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"
@@ -1972,7 +2005,7 @@ config ARCH_HAS_DEVMEM_IS_ALLOWED
 
 config STRICT_DEVMEM
        bool "Filter access to /dev/mem"
-       depends on MMU
+       depends on MMU && DEVMEM
        depends on ARCH_HAS_DEVMEM_IS_ALLOWED
        default y if TILE || PPC
        ---help---