From: Heiko Carstens Date: Tue, 6 Oct 2009 08:34:07 +0000 (+0200) Subject: [S390] ftrace: drop nmi protection X-Git-Tag: upstream/snapshot3+hdmi~16837^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22ceaf408f22680b7448f2699567ba22202e6281;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [S390] ftrace: drop nmi protection The function graph tracer used to have a protection against NMI while entering a function entry tracing. But this is useless now, the tracer is reentrant and the ring buffer supports NMI tracing. Same as 07868b086cca784f4b532fc2ab574ec3a73b468a for x86. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index 57bdcb1..f5fe34d 100644 --- a/arch/s390/kernel/ftrace.c +++ b/arch/s390/kernel/ftrace.c @@ -185,9 +185,6 @@ unsigned long prepare_ftrace_return(unsigned long ip, unsigned long parent) { struct ftrace_graph_ent trace; - /* Nmi's are currently unsupported. */ - if (unlikely(in_nmi())) - goto out; if (unlikely(atomic_read(¤t->tracing_graph_pause))) goto out; if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY)