From 5b2f8f4ca64387b59b97488363f328d8799b9a11 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 2 Jun 2009 14:01:19 -0400
Subject: [PATCH] --- yaml --- r: 146231 b: refs/heads/master c:
 26c01624a2a40f8a4ddf6449b65c9b1c418d0e72 h: refs/heads/master i:   146229:
 6bc31bdc85b76fd25b461049b6b74ad88c14edc6   146227:
 2ec4b98b5cf7391bea131ebfd1e927b5a9b9a93d   146223:
 4de21a4bdd32a4833180703cb4ad33a3e7a411f1 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/trace/ftrace.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5f428b1d9674..005de54bcc32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82310a3272d5a2a7652f5649ad8a55f58c8f74d9
+refs/heads/master: 26c01624a2a40f8a4ddf6449b65c9b1c418d0e72
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 20e066065eb3..1664d3f33d38 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -2580,12 +2580,12 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
 		}
 
 		if (t->ret_stack == NULL) {
-			t->curr_ret_stack = -1;
-			/* Make sure IRQs see the -1 first: */
-			barrier();
-			t->ret_stack = ret_stack_list[start++];
 			atomic_set(&t->tracing_graph_pause, 0);
 			atomic_set(&t->trace_overrun, 0);
+			t->curr_ret_stack = -1;
+			/* Make sure the tasks see the -1 first: */
+			smp_wmb();
+			t->ret_stack = ret_stack_list[start++];
 		}
 	} while_each_thread(g, t);