diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-23 03:10:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-23 03:10:29 -0400 |
| commit | 3a01736e70a7d629140695ba46a901266b4460cc (patch) | |
| tree | 49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253 /kernel/trace/trace_output.c | |
| parent | 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb (diff) | |
| parent | 24a461d537f49f9da6533d83100999ea08c6c755 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index a46197b80b7f..02272baa2206 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
| @@ -16,9 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | DECLARE_RWSEM(trace_event_mutex); | 17 | DECLARE_RWSEM(trace_event_mutex); |
| 18 | 18 | ||
| 19 | DEFINE_PER_CPU(struct trace_seq, ftrace_event_seq); | ||
| 20 | EXPORT_PER_CPU_SYMBOL(ftrace_event_seq); | ||
| 21 | |||
| 22 | static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly; | 19 | static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly; |
| 23 | 20 | ||
| 24 | static int next_event_type = __TRACE_LAST_TYPE + 1; | 21 | static int next_event_type = __TRACE_LAST_TYPE + 1; |