|
@@ -211,29 +211,15 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
|
|
|
unsigned long frame_pointer)
|
|
|
{
|
|
|
unsigned long return_hooker = (unsigned long)&return_to_handler;
|
|
|
- struct ftrace_graph_ent trace;
|
|
|
unsigned long old;
|
|
|
- int err;
|
|
|
|
|
|
if (unlikely(atomic_read(¤t->tracing_graph_pause)))
|
|
|
return;
|
|
|
|
|
|
old = *parent;
|
|
|
|
|
|
- trace.func = self_addr;
|
|
|
- trace.depth = current->curr_ret_stack + 1;
|
|
|
-
|
|
|
- /* Only trace if the calling function expects to */
|
|
|
- if (!ftrace_graph_entry(&trace))
|
|
|
- return;
|
|
|
-
|
|
|
- err = ftrace_push_return_trace(old, self_addr, &trace.depth,
|
|
|
- frame_pointer, NULL);
|
|
|
-
|
|
|
- if (err == -EBUSY)
|
|
|
- return;
|
|
|
-
|
|
|
- *parent = return_hooker;
|
|
|
+ if (!function_graph_enter(old, self_addr, frame_pointer, NULL))
|
|
|
+ *parent = return_hooker;
|
|
|
}
|
|
|
|
|
|
noinline void ftrace_graph_caller(void)
|