diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-11-13 19:21:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-11-13 19:21:32 +0100 |
| commit | 84e53ff77cb1e005f49966cd6789109d84acc9e2 (patch) | |
| tree | 4d1426dc45c8af73e78279bd737eb1dd63909f11 /kernel/trace/trace_sched_switch.c | |
| parent | ccf59d8da119ab03dcbdf95fb5e5adcef6ba51f2 (diff) | |
| parent | 7bcfaf54f591a0775254c4ea679faf615152ee3a (diff) | |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steven Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_sched_switch.c')
| -rw-r--r-- | kernel/trace/trace_sched_switch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c index 7e62c0a18456..3374c792ccd8 100644 --- a/kernel/trace/trace_sched_switch.c +++ b/kernel/trace/trace_sched_switch.c @@ -102,9 +102,7 @@ tracing_sched_wakeup_trace(struct trace_array *tr, entry->next_cpu = task_cpu(wakee); if (!filter_check_discard(call, entry, buffer, event)) - ring_buffer_unlock_commit(buffer, event); - ftrace_trace_stack(tr->buffer, flags, 6, pc); - ftrace_trace_userstack(tr->buffer, flags, pc); + trace_buffer_unlock_commit(buffer, event, flags, pc); } static void |