diff options
-rw-r--r-- | MAINTAINERS | 16 | ||||
-rw-r--r-- | drivers/char/vt.c | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index de1e4e6f3bd6..90f81283b722 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3363,6 +3363,16 @@ F: drivers/serial/kgdboc.c | |||
3363 | F: include/linux/kgdb.h | 3363 | F: include/linux/kgdb.h |
3364 | F: kernel/kgdb.c | 3364 | F: kernel/kgdb.c |
3365 | 3365 | ||
3366 | KMEMLEAK | ||
3367 | P: Catalin Marinas | ||
3368 | M: catalin.marinas@arm.com | ||
3369 | L: linux-kernel@vger.kernel.org | ||
3370 | S: Maintained | ||
3371 | F: Documentation/kmemleak.txt | ||
3372 | F: include/linux/kmemleak.h | ||
3373 | F: mm/kmemleak.c | ||
3374 | F: mm/kmemleak-test.c | ||
3375 | |||
3366 | KMEMTRACE | 3376 | KMEMTRACE |
3367 | P: Eduard - Gabriel Munteanu | 3377 | P: Eduard - Gabriel Munteanu |
3368 | M: eduard.munteanu@linux360.ro | 3378 | M: eduard.munteanu@linux360.ro |
@@ -3372,12 +3382,6 @@ F: Documentation/trace/kmemtrace.txt | |||
3372 | F: include/trace/kmemtrace.h | 3382 | F: include/trace/kmemtrace.h |
3373 | F: kernel/trace/kmemtrace.c | 3383 | F: kernel/trace/kmemtrace.c |
3374 | 3384 | ||
3375 | KMEMLEAK | ||
3376 | P: Catalin Marinas | ||
3377 | M: catalin.marinas@arm.com | ||
3378 | L: linux-kernel@vger.kernel.org | ||
3379 | S: Maintained | ||
3380 | |||
3381 | KPROBES | 3385 | KPROBES |
3382 | P: Ananth N Mavinakayanahalli | 3386 | P: Ananth N Mavinakayanahalli |
3383 | M: ananth@in.ibm.com | 3387 | M: ananth@in.ibm.com |
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index de9ebee8657b..c796a86ab7f3 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -103,7 +103,6 @@ | |||
103 | #include <linux/io.h> | 103 | #include <linux/io.h> |
104 | #include <asm/system.h> | 104 | #include <asm/system.h> |
105 | #include <linux/uaccess.h> | 105 | #include <linux/uaccess.h> |
106 | #include <linux/kmemleak.h> | ||
107 | 106 | ||
108 | #define MAX_NR_CON_DRIVER 16 | 107 | #define MAX_NR_CON_DRIVER 16 |
109 | 108 | ||