diff options
| -rw-r--r-- | arch/powerpc/kernel/ftrace.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c index 5b5d16b2cac8..5455943f16aa 100644 --- a/arch/powerpc/kernel/ftrace.c +++ b/arch/powerpc/kernel/ftrace.c | |||
| @@ -557,7 +557,6 @@ extern void mod_return_to_handler(void); | |||
| 557 | void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | 557 | void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) |
| 558 | { | 558 | { |
| 559 | unsigned long old; | 559 | unsigned long old; |
| 560 | unsigned long long calltime; | ||
| 561 | int faulted; | 560 | int faulted; |
| 562 | struct ftrace_graph_ent trace; | 561 | struct ftrace_graph_ent trace; |
| 563 | unsigned long return_hooker = (unsigned long)&return_to_handler; | 562 | unsigned long return_hooker = (unsigned long)&return_to_handler; |
| @@ -606,10 +605,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
| 606 | return; | 605 | return; |
| 607 | } | 606 | } |
| 608 | 607 | ||
| 609 | calltime = cpu_clock(raw_smp_processor_id()); | 608 | if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) { |
| 610 | |||
| 611 | if (ftrace_push_return_trace(old, calltime, | ||
| 612 | self_addr, &trace.depth) == -EBUSY) { | ||
| 613 | *parent = old; | 609 | *parent = old; |
| 614 | return; | 610 | return; |
| 615 | } | 611 | } |
