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

[firefly-linux-kernel-4.4.55.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4e35a5d767ed2f50c69df7dbdbcf0e3d9885777f..5f2ce616c0462db9b9055528110268385b2b653e 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.
 
          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
 config DEBUG_FS
        bool "Debug Filesystem"
        help


@@ -1238,21 +1254,9 @@ config RCU_CPU_STALL_TIMEOUT
          RCU grace period persists, additional CPU stall warnings are
          printed at more widely spaced intervals.
 
          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"
 config RCU_CPU_STALL_INFO
        bool "Print additional diagnostics on RCU CPU stall"

-       depends on (TREE_RCU || TREE_PREEMPT_RCU) && DEBUG_KERNEL
+       depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL

        default n
        help
          For each stalled CPU that is aware of the current RCU grace
        default n
        help
          For each stalled CPU that is aware of the current RCU grace