[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-5767cfeaa9ec7b67c802143394f3ad9f8b174eb8@git.kernel.org>
Date: Tue, 21 Aug 2012 08:04:37 -0700
From: tip-bot for Steven Rostedt <srostedt@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
rostedt@...dmis.org, srostedt@...hat.com, tglx@...utronix.de
Subject: [tip:perf/core] ftrace/x86:
Remove function_trace_stop check from graph caller
Commit-ID: 5767cfeaa9ec7b67c802143394f3ad9f8b174eb8
Gitweb: http://git.kernel.org/tip/5767cfeaa9ec7b67c802143394f3ad9f8b174eb8
Author: Steven Rostedt <srostedt@...hat.com>
AuthorDate: Tue, 3 Jul 2012 16:16:09 -0400
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Tue, 31 Jul 2012 10:29:51 -0400
ftrace/x86: Remove function_trace_stop check from graph caller
The graph caller is called by the mcount callers, which already does
the check against the function_trace_stop variable. No reason to
check it again.
Link: http://lkml.kernel.org/r/20120711195745.588538769@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
arch/x86/kernel/entry_32.S | 3 ---
arch/x86/kernel/entry_64.S | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 4dc3017..061ac17 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/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/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 52bda2e..38308fa 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists