Commit-ID: 07868b086cca784f4b532fc2ab574ec3a73b468a Gitweb: http://git.kernel.org/tip/07868b086cca784f4b532fc2ab574ec3a73b468a Author: Frederic Weisbecker <fweisbec@xxxxxxxxx> AuthorDate: Wed, 29 Jul 2009 03:33:51 +0200 Committer: Frederic Weisbecker <fweisbec@xxxxxxxxx> CommitDate: Thu, 6 Aug 2009 07:28:05 +0200 tracing/function-graph-tracer: Drop the useless nmi protection The function graph tracer used to have a protection against NMI while entering a function entry tracing. But this is useless now, this tracer is reentrant and the ring buffer supports the NMI tracing. We can then drop this protection. Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> --- arch/x86/kernel/ftrace.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index d94e1ea..8e96634 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -417,10 +417,6 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, unsigned long return_hooker = (unsigned long) &return_to_handler; - /* Nmi's are currently unsupported */ - if (unlikely(in_nmi())) - return; - if (unlikely(atomic_read(¤t->tracing_graph_pause))) return; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|