Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[safe/jmp/linux-2.6] / arch / s390 / kernel / ftrace.c

diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index c92a109..6a83d05 100644 (file)
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -12,7 +12,8 @@
 #include <linux/ftrace.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <asm/lowcore.h>
+#include <trace/syscall.h>
+#include <asm/asm-offsets.h>
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 
@@ -184,12 +185,9 @@ 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(&current->tracing_graph_pause)))
                goto out;
-       if (ftrace_push_return_trace(parent, ip, &trace.depth) == -EBUSY)
+       if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY)
                goto out;
        trace.func = ftrace_mcount_call_adjust(ip) & PSW_ADDR_INSN;
        /* Only trace if the calling function expects to. */