---

yaml --- r: 338995 b: refs/heads/master c: 2b70e59 h: refs/heads/master i: 338993: d1f9460 338991: 4b65b08 v: v3
git-mirror · Oct 31, 2012 · 73420d7 · 73420d7
1 parent 00d402b
commit 73420d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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