Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-10 14:33:06 +0200
committerTakashi Iwai <tiwai@suse.de>2018-07-10 14:33:24 +0200
commit358fc7119a5e14746252130302a05d28a54814f7 (patch)
treebe38bf1a85ab9909777ce81cf2ce202d80a73765
parent64352797e706269b0ce4f14574cf3ba370716f65 (diff)
Fix kABI breakage with CONFIG_RT_GROUP_SCHED=n (bsc#1100734).
-rw-r--r--include/linux/sched.h2
-rw-r--r--kernel/sched/sched.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 370f127ef39c..ab635a760932 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -422,7 +422,7 @@ struct sched_rt_entity {
unsigned short on_list;
struct sched_rt_entity *back;
-#ifdef CONFIG_RT_GROUP_SCHED
+#if 1 /* unconditionally enabled for kABI w/o CONFIG_RT_GROUP_SCHED */
struct sched_rt_entity *parent;
/* rq on which this entity is (to be) queued: */
struct rt_rq *rt_rq;
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 0fc1d6c2ab0f..ad8fb71dfcb6 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -294,7 +294,7 @@ struct task_group {
#endif
#endif
-#ifdef CONFIG_RT_GROUP_SCHED
+#if 1 /* unconditionally enabled for kABI w/o CONFIG_RT_GROUP_SCHED */
struct sched_rt_entity **rt_se;
struct rt_rq **rt_rq;
@@ -516,7 +516,7 @@ struct rt_rq {
/* Nests inside the rq lock: */
raw_spinlock_t rt_runtime_lock;
-#ifdef CONFIG_RT_GROUP_SCHED
+#if 1 /* unconditionally enabled for kABI w/o CONFIG_RT_GROUP_SCHED */
unsigned long rt_nr_boosted;
struct rq *rq;