diff --git a/include/linux/sched.h b/include/linux/sched.h index 1e11e2ecf83bd7c6df0524b8e427f3ed35a6a522..0cdc883a13a62d0edd224bbec836b94397a1dc0f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -478,6 +478,11 @@ struct sched_entity { */ struct sched_avg avg; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; struct sched_rt_entity { @@ -1199,6 +1204,15 @@ struct task_struct { */ randomized_struct_fields_end + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + /* CPU-specific state of this task: */ struct thread_struct thread; diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h index 1be35729c2c5b9c0bb915653d7778e0acbdfd29b..85c13bd59f6f80ed25058a19c87ffe1ca901ff7a 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -2,6 +2,7 @@ #ifndef _LINUX_SCHED_SIGNAL_H #define _LINUX_SCHED_SIGNAL_H +#include #include #include #include @@ -232,6 +233,11 @@ struct signal_struct { struct mutex cred_guard_mutex; /* guard against foreign influences on * credential calculations * (notably. ptrace) */ + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) } __randomize_layout; /* diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index 39ad98c09c5808e42a04c5155f0d52aef92cbae8..13df221483ae0f26225c019c7a1b85ab59402cf4 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -2,6 +2,7 @@ #ifndef _LINUX_SCHED_USER_H #define _LINUX_SCHED_USER_H +#include #include #include #include @@ -46,6 +47,9 @@ struct user_struct { /* Miscellaneous per-user rate limit */ struct ratelimit_state ratelimit; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern int uids_sysfs_init(void); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 23411a1d6a253d61428e2684ea832f6eabb98446..d92a9aa04278b0179b1fcc88dc78df9ee68f101a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -64,6 +64,7 @@ #include #include #include +#include #include @@ -392,6 +393,9 @@ struct task_group { #endif struct cfs_bandwidth cfs_bandwidth; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; #ifdef CONFIG_FAIR_GROUP_SCHED @@ -567,6 +571,9 @@ struct cfs_rq { struct list_head throttled_list; #endif /* CONFIG_CFS_BANDWIDTH */ #endif /* CONFIG_FAIR_GROUP_SCHED */ + + KABI_RESERVE(1) + KABI_RESERVE(2) }; static inline int rt_bandwidth_enabled(void) @@ -751,6 +758,11 @@ struct root_domain { struct cpupri cpupri; unsigned long max_cpu_capacity; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; extern struct root_domain def_root_domain; @@ -917,6 +929,9 @@ struct rq { /* Must be inspected within a rcu lock section */ struct cpuidle_state *idle_state; #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct cputime { @@ -1227,6 +1242,9 @@ struct sched_group { struct sched_group_capacity *sgc; int asym_prefer_cpu; /* CPU of highest priority in group */ + KABI_RESERVE(1) + KABI_RESERVE(2) + /* * The CPUs this group covers. * @@ -1575,6 +1593,9 @@ struct sched_class { #ifdef CONFIG_FAIR_GROUP_SCHED void (*task_change_group)(struct task_struct *p, int type); #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) }; static inline void put_prev_task(struct rq *rq, struct task_struct *prev)