Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --combined kernel/events/ring_buffer.c
index 045a37e9ddee3255fac6ab34b80682f4e2e968e1,d11f60cbe8ca4dff1faba7b8ef3c1cc826f98a25..5d3cf407e37469a7b1cafab8c4af303d074bbdf8
--- 1/kernel/events/ring_buffer.c
--- 2/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@@ -103,7 -103,7 +103,7 @@@ out
        preempt_enable();
  }
  
- static bool __always_inline
+ static __always_inline bool
  ring_buffer_has_space(unsigned long head, unsigned long tail,
                      unsigned long data_size, unsigned int size,
                      bool backward)
@@@ -114,7 -114,7 +114,7 @@@
                return CIRC_SPACE(tail, head, data_size) >= size;
  }
  
- static int __always_inline
+ static __always_inline int
  __perf_output_begin(struct perf_output_handle *handle,
                    struct perf_event *event, unsigned int size,
                    bool backward)
@@@ -414,7 -414,7 +414,7 @@@ err
  }
  EXPORT_SYMBOL_GPL(perf_aux_output_begin);
  
- static bool __always_inline rb_need_aux_wakeup(struct ring_buffer *rb)
+ static __always_inline bool rb_need_aux_wakeup(struct ring_buffer *rb)
  {
        if (rb->aux_overwrite)
                return false;
@@@ -614,8 -614,7 +614,8 @@@ int rb_alloc_aux(struct ring_buffer *rb
                }
        }
  
 -      rb->aux_pages = kzalloc_node(nr_pages * sizeof(void *), GFP_KERNEL, node);
 +      rb->aux_pages = kcalloc_node(nr_pages, sizeof(void *), GFP_KERNEL,
 +                                   node);
        if (!rb->aux_pages)
                return -ENOMEM;