diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-20 12:26:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-20 12:26:48 -0400 |
| commit | d4c4038343510d83727ea922de4435996c26c0c8 (patch) | |
| tree | ec735b5133ddb0c46211c87a2a7ee66c71a6d433 /arch/s390/kernel | |
| parent | 3daeb4da9a0b056bdc4af003e5605c1da4c0b068 (diff) | |
| parent | 71e308a239c098673570d0b417d42262bb535909 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index 82ddfd3a75af..3e298e64f0db 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) | |||
| 190 | goto out; | 190 | goto out; |
| 191 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) | 191 | if (unlikely(atomic_read(¤t->tracing_graph_pause))) |
| 192 | goto out; | 192 | goto out; |
| 193 | if (ftrace_push_return_trace(parent, ip, &trace.depth) == -EBUSY) | 193 | if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY) |
| 194 | goto out; | 194 | goto out; |
| 195 | trace.func = ftrace_mcount_call_adjust(ip) & PSW_ADDR_INSN; | 195 | trace.func = ftrace_mcount_call_adjust(ip) & PSW_ADDR_INSN; |
| 196 | /* Only trace if the calling function expects to. */ | 196 | /* Only trace if the calling function expects to. */ |