diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:57 -0400 |
| commit | c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8 (patch) | |
| tree | 3f44aa013d31d34951e9610e79ff14c1148ad6ac /kernel/trace/trace_event_perf.c | |
| parent | 7be7923633a142402266d642ccebf74f556a649b (diff) | |
| parent | 018378c55b03f88ff513aba4e0e93b8d4a9cf241 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/trace/trace_event_perf.c')
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index e6f65887842c..4799d7047eb0 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | #include <linux/kprobes.h> | 9 | #include <linux/kprobes.h> |
| 10 | #include "trace.h" | 10 | #include "trace.h" |
| 11 | 11 | ||
| 12 | EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); | ||
| 13 | |||
| 14 | static char *perf_trace_buf[4]; | 12 | static char *perf_trace_buf[4]; |
| 15 | 13 | ||
| 16 | /* | 14 | /* |