---

yaml --- r: 323619 b: refs/heads/master c: 5767cfe h: refs/heads/master i: 323617: 56256f0 323615: a57913b v: v3
git-mirror · Jul 31, 2012 · 326cb6b · 326cb6b
1 parent 8b8b73f
commit 326cb6b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4ea3f6b1bf3d489674a3660db652636e50186f9
+refs/heads/master: 5767cfeaa9ec7b67c802143394f3ad9f8b174eb8
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
@@ -1241,9 +1241,6 @@ END(mcount)
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 ENTRY(ftrace_graph_caller)
-	cmpl $0, function_trace_stop
-	jne ftrace_stub
-
 	pushl %eax
 	pushl %ecx
 	pushl %edx

diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
@@ -213,9 +213,6 @@ END(mcount)
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 ENTRY(ftrace_graph_caller)
-	cmpl $0, function_trace_stop
-	jne ftrace_stub
-
 	MCOUNT_SAVE_FRAME
 
 	leaq 8(%rbp), %rdi