hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EC9K CVE: NA
--------------------------------
Fix kabi breakage in commit b6b0f1324f6a [1], 423feb16ead5 [2], a75073a3a251 [3]
[1]: b6b0f1324f6a ("perf: Capture branch privilege information") [2]: 423feb16ead5 ("perf: Extend branch type classification") [3]: a75073a3a251 ("perf/core: Add speculation info to branch entries")
Signed-off-by: Junhao He hejunhao3@huawei.com --- include/uapi/linux/perf_event.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index b9cdf864164e..ce791f5a49fe 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -1341,10 +1341,14 @@ struct perf_branch_entry { abort:1, /* transaction abort */ cycles:16, /* cycle count to last branch */ type:4, /* branch type */ + #ifdef __GENKSYMS__ + reserved:40; + #else spec:2, /* branch speculation info */ new_type:4, /* additional branch type */ priv:3, /* privilege level */ reserved:31; + #endif };
union perf_sample_weight {