History

tools headers UAPI: Update tools's copy of linux/perf_event.h

To get the changes in: bbfd5e4fab63 ("perf/core: Add new branch sample type for HW index of raw branch records") This silences this perf tools build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h' differs from latest version at 'include/uapi/linux/perf_event.h' diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.h This update is a prerequisite to adding support for the HW index of raw branch records.

Arnaldo Carvalho de Melo committed 6 years ago

Commit 63399981 parent 401d61c1 file · +7 −1Browse files

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

Unified · Split

tools/include/uapi/linux/perf_event.h+7−1
@@ -181,6 +181,8 @@ enum perf_branch_sample_type_shift { · 180 unmodified lines
181 181
182 PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16, /* save branch type */182 PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16, /* save branch type */
183 183
184 PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17, /* save low level index of raw branch records */
185
184 PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */186 PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */
185};187};
186 188
@@ -208,6 +210,8 @@ enum perf_branch_sample_type { · 21 unmodified lines
208 PERF_SAMPLE_BRANCH_TYPE_SAVE =210 PERF_SAMPLE_BRANCH_TYPE_SAVE =
209 1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,211 1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,
210 212
213 PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,
214
211 PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,215 PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
212};216};
213 217
@@ -853,7 +857,9 @@ enum perf_event_type { · 639 unmodified lines
853 * char data[size];}&& PERF_SAMPLE_RAW857 * char data[size];}&& PERF_SAMPLE_RAW
854 *858 *
855 * { u64 nr;859 * { u64 nr;
856 * { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK860 * { u64 hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX
861 * { u64 from, to, flags } lbr[nr];
862 * } && PERF_SAMPLE_BRANCH_STACK
857 *863 *
858 * { u64 abi; # enum perf_sample_regs_abi864 * { u64 abi; # enum perf_sample_regs_abi
859 * u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER865 * u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER