diff options
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index b79c5533c42..d94e1ea3b9f 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -408,7 +408,8 @@ int ftrace_disable_ftrace_graph_caller(void)   * Hook the return address and push it in the stack of return addrs   * in current thread info.   */ -void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) +void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, +			   unsigned long frame_pointer)  {  	unsigned long old;  	int faulted; @@ -453,7 +454,8 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)  		return;  	} -	if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) { +	if (ftrace_push_return_trace(old, self_addr, &trace.depth, +		    frame_pointer) == -EBUSY) {  		*parent = old;  		return;  	}  |