Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index cfe8ca6..61689a8 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -227,6 +227,22 @@ config UNUSED_SYMBOLS
          you really need it, and what the merge plan to the mainline kernel for
          your module is.
 
+config PAGE_OWNER
+       bool "Track page owner"
+       depends on DEBUG_KERNEL && STACKTRACE_SUPPORT
+       select DEBUG_FS
+       select STACKTRACE
+       select PAGE_EXTENSION
+       help
+         This keeps track of what call chain is the owner of a page, may
+         help to find bare alloc_page(s) leaks. Even if you include this
+         feature on your build, it is disabled in default. You should pass
+         "page_owner=on" to boot parameter in order to enable it. Eats
+         a fair amount of memory if enabled. See tools/vm/page_owner_sort.c
+         for user-space helper.
+
+         If unsure, say N.
+
 config DEBUG_FS
        bool "Debug Filesystem"
        help
@@ -1199,6 +1215,7 @@ config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL
        select TORTURE_TEST
+       select SRCU
        default n
        help
          This option provides a kernel module that runs torture tests
@@ -1238,22 +1255,10 @@ config RCU_CPU_STALL_TIMEOUT
          RCU grace period persists, additional CPU stall warnings are
          printed at more widely spaced intervals.
 
-config RCU_CPU_STALL_VERBOSE
-       bool "Print additional per-task information for RCU_CPU_STALL_DETECTOR"
-       depends on TREE_PREEMPT_RCU
-       default y
-       help
-         This option causes RCU to printk detailed per-task information
-         for any tasks that are stalling the current RCU grace period.
-
-         Say N if you are unsure.
-
-         Say Y if you want to enable such checks.
-
 config RCU_CPU_STALL_INFO
        bool "Print additional diagnostics on RCU CPU stall"
-       depends on (TREE_RCU || TREE_PREEMPT_RCU) && DEBUG_KERNEL
-       default n
+       depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL
+       default y
        help
          For each stalled CPU that is aware of the current RCU grace
          period, print out additional per-CPU diagnostic information