From: Frederic Weisbecker Date: Wed, 29 Jul 2009 01:33:51 +0000 (+0200) Subject: tracing/function-graph-tracer: Drop the useless nmi protection X-Git-Tag: v2.6.32-rc1~718^2~71 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=07868b086cca784f4b532fc2ab574ec3a73b468a;p=karo-tx-linux.git 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 Cc: Steven Rostedt --- diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index d94e1ea3b9fe..8e9663413b7f 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;