summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-20 18:26:48 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-20 18:26:48 +0200
commitd4c4038343510d83727ea922de4435996c26c0c8 (patch)
treeec735b5133ddb0c46211c87a2a7ee66c71a6d433 /arch/s390/kernel
parent3daeb4da9a0b056bdc4af003e5605c1da4c0b068 (diff)
parent71e308a239c098673570d0b417d42262bb535909 (diff)
downloadop-kernel-dev-d4c4038343510d83727ea922de4435996c26c0c8.zip
op-kernel-dev-d4c4038343510d83727ea922de4435996c26c0c8.tar.gz
Merge branch 'tip/tracing/urgent-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 82ddfd3..3e298e6 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -190,7 +190,7 @@ unsigned long prepare_ftrace_return(unsigned long ip, unsigned long parent)
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. */
OpenPOWER on IntegriCloud