From 73420d753fb6a3bfe81a1cb369087fc55d0cf80b Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 11 Oct 2012 11:14:14 -0400 Subject: [PATCH] --- yaml --- r: 338995 b: refs/heads/master c: 2b70e59043f5a5ec083ea50cd2640aa49c64c675 h: refs/heads/master i: 338993: d1f9460b4803806a149ae2a1b1727f5fce01da7b 338991: 4b65b08c5e8be510a5fcded62283a1936393d993 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_sched_switch.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 96b6d1668eba..52a8d3a53238 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81698831bc462ff16f76bc11249a1e492424da4c +refs/heads/master: 2b70e59043f5a5ec083ea50cd2640aa49c64c675 diff --git a/trunk/kernel/trace/trace_sched_switch.c b/trunk/kernel/trace/trace_sched_switch.c index 7e62c0a18456..b0a136ac382a 100644 --- a/trunk/kernel/trace/trace_sched_switch.c +++ b/trunk/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_nowake_buffer_unlock_commit(buffer, event, flags, pc); } static void