Merge tag 'trace-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

Pull tracing updates from Steven Rostedt:
 "This release cycle is rather small.  Just a few fixes to tracing.

  The big change is the addition of the hwlat tracer. It not only
  detects SMIs, but also other latency that's caused by the hardware. I
  have detected some latency from large boxes having bus contention"

* tag 'trace-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Call traceoff trigger after event is recorded
  ftrace/scripts: Add helper script to bisect function tracing problem functions
  tracing: Have max_latency be defined for HWLAT_TRACER as well
  tracing: Add NMI tracing in hwlat detector
  tracing: Have hwlat trace migrate across tracing_cpumask CPUs
  tracing: Add documentation for hwlat_detector tracer
  tracing: Added hardware latency tracer
  ftrace: Access ret_stack->subtime only in the function profiler
  function_graph: Handle TRACE_BPUTS in print_graph_comment
  tracing/uprobe: Drop isdigit() check in create_trace_uprobe

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

diff --cc include/linux/ftrace.h
index 6f93ac4,1e2b316..b3d34d3
--- 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 0cbe38a,148c90f..4e480e8
--- 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