diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 6c1989c7bb811c50163be5d693ce4a1cb12a0a00..df4a42f117e2cb1e28b3215af028082e76916349 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -20,6 +20,7 @@ #include #include #include +#include struct clocksource; struct module; @@ -131,6 +132,11 @@ struct clocksource { u64 wd_last; #endif struct module *owner; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index f2044d5a652b5c6eed1652f2a7f1c23050d854a6..4ea2b1a56a4e9529320136cbaff875dc5f53a064 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -20,6 +20,7 @@ #include #include #include +#include struct hrtimer_clock_base; struct hrtimer_cpu_base; @@ -124,6 +125,9 @@ struct hrtimer { u8 is_rel; u8 is_soft; u8 is_hard; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -165,6 +169,9 @@ struct hrtimer_clock_base { struct timerqueue_head active; ktime_t (*get_time)(void); ktime_t offset; + + KABI_RESERVE(1) + KABI_RESERVE(2) } __hrtimer_clock_base_align; enum hrtimer_base_type { @@ -235,6 +242,9 @@ struct hrtimer_cpu_base { ktime_t softirq_expires_next; struct hrtimer *softirq_next_timer; struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; + + KABI_RESERVE(1) + KABI_RESERVE(2) } ____cacheline_aligned; static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) diff --git a/include/linux/kobject.h b/include/linux/kobject.h index c30affcc43b444cc17cb894b83b17b52e41f8ebc..505dee42aaae2fd7ed4c8b0e081e1d703eb69b74 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -15,6 +15,7 @@ #ifndef _KOBJECT_H_ #define _KOBJECT_H_ +#include #include #include #include @@ -79,6 +80,9 @@ struct kobject { #ifdef CONFIG_DEBUG_KOBJECT_RELEASE struct delayed_work release; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; __printf(2, 3) int kobject_set_name(struct kobject *kobj, const char *name, ...); @@ -120,6 +124,9 @@ struct kobj_type { const struct kobj_ns_type_operations *(*child_ns_type)(const struct kobject *kobj); const void *(*namespace)(const struct kobject *kobj); void (*get_ownership)(const struct kobject *kobj, kuid_t *uid, kgid_t *gid); + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct kobj_uevent_env { @@ -170,6 +177,9 @@ struct kset { spinlock_t list_lock; struct kobject kobj; const struct kset_uevent_ops *uevent_ops; + + KABI_RESERVE(1) + KABI_RESERVE(2) } __randomize_layout; void kset_init(struct kset *kset); diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h index 468328b1e1dd583fedfdd67e4f85bfd94d43c31d..63f857d5843588c4fba43730c149a6201ce2019f 100644 --- a/include/linux/posix-clock.h +++ b/include/linux/posix-clock.h @@ -12,6 +12,7 @@ #include #include #include +#include struct posix_clock; @@ -62,6 +63,11 @@ struct posix_clock_operations { ssize_t (*read) (struct posix_clock *pc, uint flags, char __user *buf, size_t cnt); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /** @@ -88,6 +94,11 @@ struct posix_clock { struct device *dev; struct rw_semaphore rwsem; bool zombie; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /** diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h index 1ef4e0f9bd2a5d61352987b4af7240c663a25cf9..3c58193f4b0fb1ccfc6e65bfa31d05b0553243bc 100644 --- a/include/linux/ptp_clock_kernel.h +++ b/include/linux/ptp_clock_kernel.h @@ -13,6 +13,7 @@ #include #include #include +#include #define PTP_CLOCK_NAME_LEN 32 /** @@ -193,6 +194,11 @@ struct ptp_clock_info { int (*verify)(struct ptp_clock_info *ptp, unsigned int pin, enum ptp_pin_function func, unsigned int chan); long (*do_aux_work)(struct ptp_clock_info *ptp); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; struct ptp_clock; diff --git a/include/linux/timer.h b/include/linux/timer.h index 9162f275819a780def8efeb98cc4b553e1c44d28..d7248545b2f6d29f279fb46136d18fa9d30b5183 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -7,6 +7,7 @@ #include #include #include +#include struct timer_list { /* @@ -21,6 +22,9 @@ struct timer_list { #ifdef CONFIG_LOCKDEP struct lockdep_map lockdep_map; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #ifdef CONFIG_LOCKDEP