diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 14:15:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 14:15:57 -0700 |
| commit | 512626a04e72aca60effe111fa0333ed0b195d21 (patch) | |
| tree | c22e23b0dcc2dd2ff5a9a96a007de6799e9223de /drivers/char/vt.c | |
| parent | 8a1ca8cedd108c8e76a6ab34079d0bbb4f244799 (diff) | |
| parent | 3aa27bbe7a6536d1ec859d3a97caf3319b5081b7 (diff) | |
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
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index c796a86ab7f..de9ebee8657 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -103,6 +103,7 @@ #include <linux/io.h> #include <asm/system.h> #include <linux/uaccess.h> +#include <linux/kmemleak.h> #define MAX_NR_CON_DRIVER 16 |