diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:28:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:28:08 -0400 |
| commit | 9fc3af467d0749989518a23f7289a6f44e5cb214 (patch) | |
| tree | d9d7e6be11a12fac94a00175c95b246744bb4f6d /kernel | |
| parent | d65a458b348cd458413b3cfec66e43ebd0367646 (diff) | |
| parent | cc05152ab72d7a65e6ea97d286af4f878c8f7371 (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')
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 23751659582e..000e6e85b445 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c | |||
| @@ -131,10 +131,10 @@ void perf_trace_destroy(struct perf_event *p_event) | |||
| 131 | tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER); | 131 | tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER); |
| 132 | 132 | ||
| 133 | /* | 133 | /* |
| 134 | * Ensure our callback won't be called anymore. See | 134 | * Ensure our callback won't be called anymore. The buffers |
| 135 | * tracepoint_probe_unregister() and __DO_TRACE(). | 135 | * will be freed after that. |
| 136 | */ | 136 | */ |
| 137 | synchronize_sched(); | 137 | tracepoint_synchronize_unregister(); |
| 138 | 138 | ||
| 139 | free_percpu(tp_event->perf_events); | 139 | free_percpu(tp_event->perf_events); |
| 140 | tp_event->perf_events = NULL; | 140 | tp_event->perf_events = NULL; |