---

yaml --- r: 121206 b: refs/heads/master c: c2324b6 h: refs/heads/master v: v3
git-mirror · Nov 26, 2008 · eb16203 · eb16203
1 parent 7167a0d
commit eb16203
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287b6e68ca7209caec40b2f44f837c580a413bae
+refs/heads/master: c2324b694fa8ffee382a124198c68754088e483c
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
@@ -1189,7 +1189,7 @@ ENTRY(mcount)
 	cmpl $ftrace_stub, ftrace_trace_function
 	jnz trace
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-	cmpl $ftrace_stub, ftrace_graph_function
+	cmpl $ftrace_stub, ftrace_graph_return
 	jnz ftrace_graph_caller
 #endif
 .globl ftrace_stub