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

Pull tracing updates from Steven Rostedt:
 "No new features this release. Mostly clean ups, restructuring and
  documentation.

   - Have ftrace_bug() show ftrace errors before the WARN, as the WARN
     will reboot the box before the error messages are printed if
     panic_on_warn is set.

   - Have traceoff_on_warn disable tracing sooner (before prints)

   - Write a message to the trace buffer that its being disabled when
     disable_trace_on_warning() is set.

   - Separate out synthetic events from histogram code to let it be used
     by other parts of the kernel.

   - More documentation on histogram design.

   - Other small fixes and clean ups"

* tag 'trace-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Remove obsolete PREEMPTIRQ_EVENTS kconfig option
  tracing/doc: Fix ascii-art in histogram-design.rst
  tracing: Add a trace print when traceoff_on_warning is triggered
  ftrace,bug: Improve traceoff_on_warn
  selftests/ftrace: Distinguish between hist and synthetic event checks
  tracing: Move synthetic events to a separate file
  tracing: Fix events.rst section numbering
  tracing/doc: Fix typos in histogram-design.rst
  tracing: Add hist_debug trace event files for histogram debugging
  tracing: Add histogram-design document
  tracing: Check state.disabled in synth event trace functions
  tracing/probe: reverse arguments to list_add
  tools/bootconfig: Add a summary of test cases and return error
  ftrace: show debugging information when panic_on_warn set

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/ftrace.c
index 7d0ebd1,cd39cbf..c163c35
--- 1/kernel/trace/ftrace.c
--- 2/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -2016,16 -2027,16 +2016,16 @@@ void ftrace_bug(int failed, struct dyn_
  {
        unsigned long ip = rec ? rec->ip : 0;
  
+       pr_info("------------[ ftrace bug ]------------\n");
+ 
        switch (failed) {
        case -EFAULT:
-               FTRACE_WARN_ON_ONCE(1);
                pr_info("ftrace faulted on modifying ");
 -              print_ip_sym(ip);
 +              print_ip_sym(KERN_INFO, ip);
                break;
        case -EINVAL:
-               FTRACE_WARN_ON_ONCE(1);
                pr_info("ftrace failed to modify ");
 -              print_ip_sym(ip);
 +              print_ip_sym(KERN_INFO, ip);
                print_ip_ins(" actual:   ", (unsigned char *)ip);
                pr_cont("\n");
                if (ftrace_expected) {
@@@ -2034,14 -2045,12 +2034,12 @@@
                }
                break;
        case -EPERM:
-               FTRACE_WARN_ON_ONCE(1);
                pr_info("ftrace faulted on writing ");
 -              print_ip_sym(ip);
 +              print_ip_sym(KERN_INFO, ip);
                break;
        default:
-               FTRACE_WARN_ON_ONCE(1);
                pr_info("ftrace faulted on unknown error ");
 -              print_ip_sym(ip);
 +              print_ip_sym(KERN_INFO, ip);
        }
        print_bug_type();
        if (rec) {

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