---

yaml --- r: 121130 b: refs/heads/master c: b01c746 h: refs/heads/master v: v3
git-mirror · Nov 16, 2008 · d3be37b · d3be37b
1 parent c82b882
commit d3be37b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;