diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/ftrace.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 57b33edb7ce3..61df77532120 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
@@ -410,7 +410,6 @@ int ftrace_disable_ftrace_graph_caller(void) | |||
410 | void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | 410 | void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) |
411 | { | 411 | { |
412 | unsigned long old; | 412 | unsigned long old; |
413 | unsigned long long calltime; | ||
414 | int faulted; | 413 | int faulted; |
415 | struct ftrace_graph_ent trace; | 414 | struct ftrace_graph_ent trace; |
416 | unsigned long return_hooker = (unsigned long) | 415 | unsigned long return_hooker = (unsigned long) |
@@ -453,10 +452,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
453 | return; | 452 | return; |
454 | } | 453 | } |
455 | 454 | ||
456 | calltime = trace_clock_local(); | 455 | if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) { |
457 | |||
458 | if (ftrace_push_return_trace(old, calltime, | ||
459 | self_addr, &trace.depth) == -EBUSY) { | ||
460 | *parent = old; | 456 | *parent = old; |
461 | return; | 457 | return; |
462 | } | 458 | } |