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 /kernel/trace/trace.h | |
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 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 75a5e800a737..075cd2ea84a2 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/mmiotrace.h> | 9 | #include <linux/mmiotrace.h> |
10 | #include <linux/tracepoint.h> | 10 | #include <linux/tracepoint.h> |
11 | #include <linux/ftrace.h> | 11 | #include <linux/ftrace.h> |
12 | #include <linux/kmemtrace.h> | ||
13 | #include <linux/hw_breakpoint.h> | 12 | #include <linux/hw_breakpoint.h> |
14 | #include <linux/trace_seq.h> | 13 | #include <linux/trace_seq.h> |
15 | #include <linux/ftrace_event.h> | 14 | #include <linux/ftrace_event.h> |
@@ -30,19 +29,12 @@ enum trace_type { | |||
30 | TRACE_GRAPH_RET, | 29 | TRACE_GRAPH_RET, |
31 | TRACE_GRAPH_ENT, | 30 | TRACE_GRAPH_ENT, |
32 | TRACE_USER_STACK, | 31 | TRACE_USER_STACK, |
33 | TRACE_KMEM_ALLOC, | ||
34 | TRACE_KMEM_FREE, | ||
35 | TRACE_BLK, | 32 | TRACE_BLK, |
36 | TRACE_KSYM, | 33 | TRACE_KSYM, |
37 | 34 | ||
38 | __TRACE_LAST_TYPE, | 35 | __TRACE_LAST_TYPE, |
39 | }; | 36 | }; |
40 | 37 | ||
41 | enum kmemtrace_type_id { | ||
42 | KMEMTRACE_TYPE_KMALLOC = 0, /* kmalloc() or kfree(). */ | ||
43 | KMEMTRACE_TYPE_CACHE, /* kmem_cache_*(). */ | ||
44 | KMEMTRACE_TYPE_PAGES, /* __get_free_pages() and friends. */ | ||
45 | }; | ||
46 | 38 | ||
47 | #undef __field | 39 | #undef __field |
48 | #define __field(type, item) type item; | 40 | #define __field(type, item) type item; |
@@ -208,10 +200,6 @@ extern void __ftrace_bad_type(void); | |||
208 | TRACE_GRAPH_ENT); \ | 200 | TRACE_GRAPH_ENT); \ |
209 | IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, \ | 201 | IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, \ |
210 | TRACE_GRAPH_RET); \ | 202 | TRACE_GRAPH_RET); \ |
211 | IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry, \ | ||
212 | TRACE_KMEM_ALLOC); \ | ||
213 | IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \ | ||
214 | TRACE_KMEM_FREE); \ | ||
215 | IF_ASSIGN(var, ent, struct ksym_trace_entry, TRACE_KSYM);\ | 203 | IF_ASSIGN(var, ent, struct ksym_trace_entry, TRACE_KSYM);\ |
216 | __ftrace_bad_type(); \ | 204 | __ftrace_bad_type(); \ |
217 | } while (0) | 205 | } while (0) |