hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBPLI0 -------------------------------- Fix kabi broken caused by the following commit. Because the reserved size is not enough, and struct hrtimer_cpu_base is not contained by any other structure, we use KABI_EXTEND to fix the kabi. Use KABI_FILL_HOLE() to fix kabi broken caused by the bit variable 'online'. Fixes: 14548083da37 ("hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING") Fixes: 8fa783f89c8c ("hrtimer: Report offline hrtimer enqueue") Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> --- include/linux/hrtimer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 1003dc3eaf656..9c4f4f15a056f 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -234,8 +234,8 @@ struct hrtimer_cpu_base { unsigned int hres_active : 1, in_hrtirq : 1, hang_detected : 1, - softirq_activated : 1, - online : 1; + softirq_activated : 1; + KABI_FILL_HOLE(unsigned int online:1) #ifdef CONFIG_HIGH_RES_TIMERS unsigned int nr_events; unsigned short nr_retries; @@ -251,10 +251,10 @@ struct hrtimer_cpu_base { ktime_t softirq_expires_next; struct hrtimer *softirq_next_timer; struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; - call_single_data_t csd; KABI_RESERVE(1) KABI_RESERVE(2) + KABI_EXTEND(call_single_data_t csd) } ____cacheline_aligned; static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) -- 2.20.1