History

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

Linus Torvalds committed 9 years ago

Commit e6328a72 parents 33f82bd 770e96137 files · +368 −268Browse files

Showing the changes to tools/include/uapi/linux (1 of 37 files). Show all

Unified · Split

tools/include/uapi/linux/perf_event.h+3−1
@@ -139,8 +139,9 @@ enum perf_event_sample_format { · 138 unmodified lines
139139 PERF_SAMPLE_IDENTIFIER = 1U << 16,
140140 PERF_SAMPLE_TRANSACTION = 1U << 17,
141141 PERF_SAMPLE_REGS_INTR = 1U << 18,
142+ PERF_SAMPLE_PHYS_ADDR = 1U << 19,
142143
143− PERF_SAMPLE_MAX = 1U << 19, /* non-ABI */
144+ PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */
144145 };
145146
146147 /*
@@ -814,6 +815,7 @@ enum perf_event_type { · 667 unmodified lines
814815 * { u64 transaction; } && PERF_SAMPLE_TRANSACTION
815816 * { u64 abi; # enum perf_sample_regs_abi
816817 * u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
818+ * { u64 phys_addr;} && PERF_SAMPLE_PHYS_ADDR
817819 * };
818820 */
819821 PERF_RECORD_SAMPLE = 9,