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, 27 insertions, 3 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 323513858c20..f8189a4b3e13 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -24,6 +24,7 @@
 #include <linux/radix-tree.h>
 #include <linux/rcupdate.h>
 #include <linux/pfn.h>
+#include <linux/kmemleak.h>
 
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
@@ -1326,6 +1327,9 @@ static void __vunmap(const void *addr, int deallocate_pages)
 void vfree(const void *addr)
 {
         BUG_ON(in_interrupt());
+
+        kmemleak_free(addr);
+
         __vunmap(addr, 1);
 }
 EXPORT_SYMBOL(vfree);
@@ -1438,8 +1442,17 @@ fail:
 
 void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot)
 {
-        return __vmalloc_area_node(area, gfp_mask, prot, -1,
-                                        __builtin_return_address(0));
+        void *addr = __vmalloc_area_node(area, gfp_mask, prot, -1,
+                                         __builtin_return_address(0));
+
+        /*
+         * A ref_count = 3 is needed because the vm_struct and vmap_area
+         * structures allocated in the __get_vm_area_node() function contain
+         * references to the virtual address of the vmalloc'ed block.
+         */
+        kmemleak_alloc(addr, area->size - PAGE_SIZE, 3, gfp_mask);
+
+        return addr;
 }
 
 /**
@@ -1458,6 +1471,8 @@ static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
                                                 int node, void *caller)
 {
         struct vm_struct *area;
+        void *addr;
+        unsigned long real_size = size;
 
         size = PAGE_ALIGN(size);
         if (!size || (size >> PAGE_SHIFT) > num_physpages)
@@ -1469,7 +1484,16 @@ static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
         if (!area)
                 return NULL;
 
-        return __vmalloc_area_node(area, gfp_mask, prot, node, caller);
+        addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller);
+
+        /*
+         * A ref_count = 3 is needed because the vm_struct and vmap_area
+         * structures allocated in the __get_vm_area_node() function contain
+         * references to the virtual address of the vmalloc'ed block.
+         */
+        kmemleak_alloc(addr, real_size, 3, gfp_mask);
+
+        return addr;
 }
 
 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)