• Linus Torvalds's avatar
    Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c81b995f
    Linus Torvalds authored
    Pull perf fixes from Thomas Gleixner:
     "A pile of perf updates:
    
      Kernel side:
    
       - Remove an incorrect warning in uprobe_init_insn() when
         insn_get_length() fails. The error return code is handled at the
         call site.
    
       - Move the inline keyword to the right place in the perf ringbuffer
         code to address a W=1 build warning.
    
      Tooling:
    
      perf stat:
    
       - Fix metric column header display alignment
    
       - Improve error messages for default attributes, providing better
         output for error in command line.
    
       - Add --interval-clear option, to provide a 'watch' like printing
    
      perf script:
    
       - Show hw-cache events too
    
      perf c2c:
    
       - Fix data dependency problem in layout of 'struct c2c_hist_entry'
    
      Core:
    
       - Do not blindly assume that 'struct perf_evsel' can be obtained via
         a straight forward container_of() as there are call sites which
         hand in a plain 'struct hist' which is not part of a container.
    
       - Fix error index in the PMU event parser, so that error messages can
         point to the problematic token"
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      perf/core: Move the inline keyword at the beginning of the function declaration
      uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
      perf script: Show hw-cache events
      perf c2c: Keep struct hist_entry at the end of struct c2c_hist_entry
      perf stat: Add event parsing error handling to add_default_attributes
      perf stat: Allow to specify specific metric column len
      perf stat: Fix metric column header display alignment
      perf stat: Use only color_fprintf call in print_metric_only
      perf stat: Add --interval-clear option
      perf tools: Fix error index for pmu event parser
      perf hists: Reimplement hists__has_callchains()
      perf hists browser gtk: Use hist_entry__has_callchains()
      perf hists: Make hist_entry__has_callchains() work with 'perf c2c'
      perf hists: Save the callchain_size in struct hist_entry
    c81b995f
ring_buffer.c 20.4 KB