|
@@ -321,8 +321,7 @@ int ftrace_disable_ftrace_graph_caller(void)
|
|
|
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
|
|
|
{
|
|
|
unsigned long old;
|
|
|
- int faulted, err;
|
|
|
- struct ftrace_graph_ent trace;
|
|
|
+ int faulted;
|
|
|
unsigned long return_hooker = (unsigned long)&return_to_handler;
|
|
|
|
|
|
if (unlikely(ftrace_graph_is_dead()))
|
|
@@ -365,18 +364,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- err = ftrace_push_return_trace(old, self_addr, &trace.depth, 0, NULL);
|
|
|
- if (err == -EBUSY) {
|
|
|
+ if (function_graph_enter(old, self_addr, 0, NULL))
|
|
|
__raw_writel(old, parent);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- trace.func = self_addr;
|
|
|
-
|
|
|
- /* Only trace if the calling function expects to */
|
|
|
- if (!ftrace_graph_entry(&trace)) {
|
|
|
- current->curr_ret_stack--;
|
|
|
- __raw_writel(old, parent);
|
|
|
- }
|
|
|
}
|
|
|
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
|