sched/rt: Add accessors rq_of_rt_se()

tkhai · Ingo Molnar · commit 653d07a6989a · 2014-04-18T12:07:27.000+02:00
Two accessors for RT_GROUP_SCHED and !RT_GROUP_SCHED cases. Signed-off-by: Kirill Tkhai <tkhai@yandex.ru> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1394835295.18748.32.camel@HP-250-G1-Notebook-PC Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
@@ -112,6 +112,13 @@ static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se)
 	return rt_se->rt_rq;
 }
 
+static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se)
+{
+	struct rt_rq *rt_rq = rt_se->rt_rq;
+
+	return rt_rq->rq;
+}
+
 void free_rt_sched_group(struct task_group *tg)
 {
 	int i;
@@ -211,10 +218,16 @@ static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq)
 	return container_of(rt_rq, struct rq, rt);
 }
 
-static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se)
+static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se)
 {
 	struct task_struct *p = rt_task_of(rt_se);
-	struct rq *rq = task_rq(p);
+
+	return task_rq(p);
+}
+
+static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se)
+{
+	struct rq *rq = rq_of_rt_se(rt_se);
 
 	return &rq->rt;
 }

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,13 @@ static inline struct rt_rq rt_rq_of_se(struct sched_rt_entity rt_se)`
`112`	`112`	`return rt_se->rt_rq;`
`113`	`113`	`}`
`114`	`114`
	`115`	`+static inline struct rq rq_of_rt_se(struct sched_rt_entity rt_se)`
	`116`	`+{`
	`117`	`+ struct rt_rq *rt_rq = rt_se->rt_rq;`
	`118`	`+`
	`119`	`+ return rt_rq->rq;`
	`120`	`+}`
	`121`	`+`
`115`	`122`	`void free_rt_sched_group(struct task_group *tg)`
`116`	`123`	`{`
`117`	`124`	`int i;`
`@@ -211,10 +218,16 @@ static inline struct rq rq_of_rt_rq(struct rt_rq rt_rq)`
`211`	`218`	`return container_of(rt_rq, struct rq, rt);`
`212`	`219`	`}`
`213`	`220`
`214`		`-static inline struct rt_rq rt_rq_of_se(struct sched_rt_entity rt_se)`
	`221`	`+static inline struct rq rq_of_rt_se(struct sched_rt_entity rt_se)`
`215`	`222`	`{`
`216`	`223`	`struct task_struct *p = rt_task_of(rt_se);`
`217`		`- struct rq *rq = task_rq(p);`
	`224`	`+`
	`225`	`+ return task_rq(p);`
	`226`	`+}`
	`227`	`+`
	`228`	`+static inline struct rt_rq rt_rq_of_se(struct sched_rt_entity rt_se)`
	`229`	`+{`
	`230`	`+ struct rq *rq = rq_of_rt_se(rt_se);`
`218`	`231`
`219`	`232`	`return &rq->rt;`
`220`	`233`	`}`