Merge branch 'for-linus' of git://linux-arm.org/linux-2.6

* 'for-linus' of git://linux-arm.org/linux-2.6:
  kmemleak: Add the corresponding MAINTAINERS entry
  kmemleak: Simple testing module for kmemleak
  kmemleak: Enable the building of the memory leak detector
  kmemleak: Remove some of the kmemleak false positives
  kmemleak: Add modules support
  kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
  kmemleak: Add the vmalloc memory allocation/freeing hooks
  kmemleak: Add the slub memory allocation/freeing hooks
  kmemleak: Add the slob memory allocation/freeing hooks
  kmemleak: Add the slab memory allocation/freeing hooks
  kmemleak: Add documentation on the memory leak detector
  kmemleak: Add the base support

Manual conflict resolution (with the slab/earlyboot changes) in:
	drivers/char/vt.c
	init/main.c
	mm/slab.c

1 files changed, 32 insertions, 0 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6cdcf38f2da9..116a35051be6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -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)