1 files changed, 36 insertions, 2 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 3be4b7caf5b8..23067ab1a73c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -300,7 +300,7 @@ config DEBUG_OBJECTS_ENABLE_DEFAULT
 
 config DEBUG_SLAB
         bool "Debug slab memory allocations"
-        depends on DEBUG_KERNEL && SLAB
+        depends on DEBUG_KERNEL && SLAB && !KMEMCHECK
         help
           Say Y here to have the kernel do limited verification on memory
           allocation as well as poisoning memory on free to catch use of freed
@@ -312,7 +312,7 @@ config DEBUG_SLAB_LEAK
 
 config SLUB_DEBUG_ON
         bool "SLUB debugging on by default"
-        depends on SLUB && SLUB_DEBUG
+        depends on SLUB && SLUB_DEBUG && !KMEMCHECK
         default n
         help
           Boot with debugging on by default. SLUB boots by default with
@@ -336,6 +336,38 @@ config SLUB_STATS
           out which slabs are relevant to a particular load.
           Try running: slabinfo -DA
 
+config DEBUG_KMEMLEAK
+        bool "Kernel memory leak detector"
+        depends on DEBUG_KERNEL && EXPERIMENTAL && (X86 || ARM) && \
+                !MEMORY_HOTPLUG
+        select DEBUG_SLAB if SLAB
+        select SLUB_DEBUG if SLUB
+        select DEBUG_FS if SYSFS
+        select STACKTRACE if STACKTRACE_SUPPORT
+        select KALLSYMS
+        help
+          Say Y here if you want to enable the memory leak
+          detector. The memory allocation/freeing is traced in a way
+          similar to the Boehm's conservative garbage collector, the
+          difference being that the orphan objects are not freed but
+          only shown in /sys/kernel/debug/kmemleak. Enabling this
+          feature will introduce an overhead to memory
+          allocations. See Documentation/kmemleak.txt for more
+          details.
+
+          In order to access the kmemleak file, debugfs needs to be
+          mounted (usually at /sys/kernel/debug).
+
+config DEBUG_KMEMLEAK_TEST
+        tristate "Simple test for the kernel memory leak detector"
+        depends on DEBUG_KMEMLEAK
+        help
+          Say Y or M here to build a test for the kernel memory leak
+          detector. This option enables a module that explicitly leaks
+          memory.
+
+          If unsure, say N.
+
 config DEBUG_PREEMPT
         bool "Debug preemptible kernel"
         depends on DEBUG_KERNEL && PREEMPT && (TRACE_IRQFLAGS_SUPPORT || PPC64)
@@ -964,3 +996,5 @@ config DMA_API_DEBUG
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"
+
+source "lib/Kconfig.kmemcheck"