From d3be37b132e4fdc0a5ac0ce72f923b2f7227dbda Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 15 Nov 2008 02:37:44 +0100
Subject: [PATCH] --- yaml --- r: 121130 b: refs/heads/master c:
 b01c746617da5e260803eb10ed64ca043e9a1241 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/ftrace.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a1a89b9fd6e..4b8d28a0ce2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 985809608f758a8d3ddda4ce5a53ed0e57fb9e1b
+refs/heads/master: b01c746617da5e260803eb10ed64ca043e9a1241
diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c
index 762222ad1387..d98b5a8ecf4c 100644
--- a/trunk/arch/x86/kernel/ftrace.c
+++ b/trunk/arch/x86/kernel/ftrace.c
@@ -56,6 +56,7 @@ static int push_return_trace(unsigned long ret, unsigned long long time,
 		return -EBUSY;
 
 	index = ++ti->curr_ret_stack;
+	barrier();
 	ti->ret_stack[index].ret = ret;
 	ti->ret_stack[index].func = func;
 	ti->ret_stack[index].calltime = time;