]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tracing/function-graph-tracer: Drop the useless nmi protection
authorFrederic Weisbecker <fweisbec@gmail.com>
Wed, 29 Jul 2009 01:33:51 +0000 (03:33 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Thu, 6 Aug 2009 05:28:05 +0000 (07:28 +0200)
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@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
arch/x86/kernel/ftrace.c

index d94e1ea3b9fe03557f99494fd4ba123143103233..8e9663413b7f1c863535e6538f0612ca4b71bb55 100644 (file)
@@ -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(&current->tracing_graph_pause)))
                return;