hulk inclusion category: Bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V CVE: NA
-------------------------------------------------
Fix kabi broken introduced by the following commit: "perf/x86/intel: Support per-thread RDPMC TopDown metrics".
Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com Reviewed-by: Yang Jihong yangjihong1@huawei.com --- include/linux/perf_event.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 0550194b3252..53869bbd8b5d 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -198,6 +198,7 @@ struct hw_perf_event { */ u64 sample_period;
+#ifndef __GENKSYMS__ union { struct { /* Sampling */ /* @@ -218,6 +219,20 @@ struct hw_perf_event { u64 saved_slots; }; }; +#else + /* + * The period we started this sample with. + */ + u64 last_period; + + /* + * However much is left of the current period; + * note that this is a full 64bit value and + * allows for generation of periods longer + * than hardware might allow. + */ + local64_t period_left; +#endif
/* * State for throttling the event, see __perf_event_overflow() and