From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 02:05:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'ftrace/for-next'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=53818e1f22812fc0a50ffe580f9e090479b76d4d

Merge remote-tracking branch 'ftrace/for-next'
---

53818e1f22812fc0a50ffe580f9e090479b76d4d
diff --cc include/linux/ftrace.h
index 6f93ac46e7f0,1e2b316d6693..b3d34d3e0e7e
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@@ -794,13 -794,10 +794,15 @@@ struct ftrace_ret_stack 
  	unsigned long ret;
  	unsigned long func;
  	unsigned long long calltime;
+ #ifdef CONFIG_FUNCTION_PROFILER
  	unsigned long long subtime;
+ #endif
 +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST
  	unsigned long fp;
 +#endif
 +#ifdef HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
 +	unsigned long *retp;
 +#endif
  };
  
  /*
diff --cc kernel/trace/trace_functions_graph.c
index 0cbe38a844fa,148c90f1e49b..4e480e870474
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@@ -170,13 -170,7 +170,12 @@@ ftrace_push_return_trace(unsigned long 
  	current->ret_stack[index].ret = ret;
  	current->ret_stack[index].func = func;
  	current->ret_stack[index].calltime = calltime;
- 	current->ret_stack[index].subtime = 0;
 +#ifdef HAVE_FUNCTION_GRAPH_FP_TEST
  	current->ret_stack[index].fp = frame_pointer;
 +#endif
 +#ifdef HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
 +	current->ret_stack[index].retp = retp;
 +#endif
  	*depth = current->curr_ret_stack;
  
  	return 0;