commit 22ceaf408f22680b7448f2699567ba22202e6281
author Heiko Carstens <heiko.carstens@de.ibm.com> Tue Oct 06 10:34:07 2009 +0200
committer Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> Tue Oct 06 10:35:08 2009 +0200
tree feebff9b0b9691c64648eaf7ba1cc06ce83f5765
parent 593c4f739859594dc4824b6d29f9abb1f0b3c669

[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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

arch/s390/kernel/ftrace.c

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 @@
 {
 	struct ftrace_graph_ent trace;
 
-	/* Nmi's are currently unsupported. */
-	if (unlikely(in_nmi()))
-		goto out;
 	if (unlikely(atomic_read(&current->tracing_graph_pause)))
 		goto out;
 	if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY)