diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2010-05-26 05:22:17 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-06-09 11:31:22 -0400 |
commit | 039ca4e74a1cf60bd7487324a564ecf5c981f254 (patch) | |
tree | 61c6fa8409961d2e22ef9d04ac54442734ebd41a /init/main.c | |
parent | 30dbb20e68e6f7df974b77d2350ebad5eb6f6c9e (diff) |
tracing: Remove kmemtrace ftrace plugin
We have been resisting new ftrace plugins and removing existing
ones, and kmemtrace has been superseded by kmem trace events
and perf-kmem, so we remove it.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
[ remove kmemtrace from the makefile, handle slob too ]
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 94f65efdc65a..e2a2bf3a169f 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -66,7 +66,6 @@ | |||
66 | #include <linux/ftrace.h> | 66 | #include <linux/ftrace.h> |
67 | #include <linux/async.h> | 67 | #include <linux/async.h> |
68 | #include <linux/kmemcheck.h> | 68 | #include <linux/kmemcheck.h> |
69 | #include <linux/kmemtrace.h> | ||
70 | #include <linux/sfi.h> | 69 | #include <linux/sfi.h> |
71 | #include <linux/shmem_fs.h> | 70 | #include <linux/shmem_fs.h> |
72 | #include <linux/slab.h> | 71 | #include <linux/slab.h> |
@@ -652,7 +651,6 @@ asmlinkage void __init start_kernel(void) | |||
652 | #endif | 651 | #endif |
653 | page_cgroup_init(); | 652 | page_cgroup_init(); |
654 | enable_debug_pagealloc(); | 653 | enable_debug_pagealloc(); |
655 | kmemtrace_init(); | ||
656 | kmemleak_init(); | 654 | kmemleak_init(); |
657 | debug_objects_mem_init(); | 655 | debug_objects_mem_init(); |
658 | idr_init_cache(); | 656 | idr_init_cache(); |