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/powerpc/kernel/ftrace.c | |
| 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/powerpc/kernel/ftrace.c')
| -rw-r--r-- | arch/powerpc/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index 2d182f119d1d..58d6a6109040 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c | |||
| @@ -605,7 +605,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
| 605 | return; | 605 | return; |
| 606 | } | 606 | } |
| 607 | 607 | ||
| 608 | if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) { | 608 | if (ftrace_push_return_trace(old, self_addr, &trace.depth, 0) == -EBUSY) { |
| 609 | *parent = old; | 609 | *parent = old; |
| 610 | return; | 610 | return; |
| 611 | } | 611 | } |