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

diff --cc arch/sh/kernel/ftrace.c
Simple merge

diff --cc include/linux/ftrace.h
index 6f93ac46e7f0a52f6091755ebf879f14dc80c525,1e2b316d669306d3614381a3157c4fc5e10c1fd5..b3d34d3e0e7efe5d5bd55d7b05616974831c636c
--- 1/include/linux/ftrace.h
--- 2/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/Kconfig
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_functions_graph.c
index 0cbe38a844fa9b57563cb650f93973b7d35e71f0,148c90f1e49b29d970977ac53bcef2ed789a072a..4e480e8704746ec85a48de6f9990a8c6ff060cd2
--- 1/kernel/trace/trace_functions_graph.c
--- 2/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;

diff --cc kernel/trace/trace_uprobe.c
Simple merge