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

Pull perf tooling updates from Ingo Molnar:
 "Perf tooling updates and fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf annotate browser: Help for cycling thru hottest instructions with TAB/shift+TAB
  perf stat: Only auto-merge events that are PMU aliases
  perf test: Add test case for PERF_SAMPLE_PHYS_ADDR
  perf script: Support physical address
  perf mem: Support physical address
  perf sort: Add sort option for physical address
  perf tools: Support new sample type for physical address
  perf vendor events powerpc: Remove duplicate events
  perf intel-pt: Fix syntax in documentation of config option
  perf test powerpc: Fix 'Object code reading' test
  perf trace: Support syscall name globbing
  perf syscalltbl: Support glob matching on syscall names
  perf report: Calculate the average cycles of iterations

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 2a37ae925d85..140ae638cfd6 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -139,8 +139,9 @@ enum perf_event_sample_format {
         PERF_SAMPLE_IDENTIFIER                  = 1U << 16,
         PERF_SAMPLE_TRANSACTION                 = 1U << 17,
         PERF_SAMPLE_REGS_INTR                   = 1U << 18,
+        PERF_SAMPLE_PHYS_ADDR                   = 1U << 19,
 
-        PERF_SAMPLE_MAX = 1U << 19,             /* non-ABI */
+        PERF_SAMPLE_MAX = 1U << 20,             /* non-ABI */
 };
 
 /*
@@ -814,6 +815,7 @@ enum perf_event_type {
          *      { u64                   transaction; } && PERF_SAMPLE_TRANSACTION
          *      { u64                   abi; # enum perf_sample_regs_abi
          *        u64                   regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
+         *      { u64                   phys_addr;} && PERF_SAMPLE_PHYS_ADDR
          * };
          */
         PERF_RECORD_SAMPLE                      = 9,