From 326cb6bc16a6d7e3c1bdf31efb47ed9a761ae91b Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 3 Jul 2012 16:16:09 -0400 Subject: [PATCH] --- yaml --- r: 323619 b: refs/heads/master c: 5767cfeaa9ec7b67c802143394f3ad9f8b174eb8 h: refs/heads/master i: 323617: 56256f0ae1e2b4597dd93f416fb8a5f1c0391143 323615: a57913bf92efeed88760e2ff69387d758d01c5d6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_32.S | 3 --- trunk/arch/x86/kernel/entry_64.S | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index aa5635854962..a3a74f231d07 100644 --- 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 index 4dc301709e78..061ac17ee974 100644 --- 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 index 52bda2e8f7aa..38308fa7d7e5 100644 --- 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