Commit-ID: 62478d9911fab9694c195f0ca8e4701de09be98e Gitweb: https://git.kernel.org/tip/62478d9911fab9694c195f0ca8e4701de09be98e Author: Vincent Guittot <vincent.guit...@linaro.org> AuthorDate: Wed, 23 Jan 2019 16:26:52 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 4 Feb 2019 09:13:21 +0100
sched/fair: Move the rq_of() helper function Move rq_of() helper function so it can be used in pelt.c [ mingo: Improve readability while at it. ] Signed-off-by: Vincent Guittot <vincent.guit...@linaro.org> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Mike Galbraith <efa...@gmx.de> Cc: morten.rasmus...@arm.com Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: bseg...@google.com Cc: dietmar.eggem...@arm.com Cc: patrick.bell...@arm.com Cc: p...@google.com Cc: pkond...@codeaurora.org Cc: quentin.per...@arm.com Cc: r...@rjwysocki.net Cc: srinivas.pandruv...@linux.intel.com Cc: thara.gopin...@linaro.org Link: https://lkml.kernel.org/r/1548257214-13745-2-git-send-email-vincent.guit...@linaro.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/sched/fair.c | 13 ------------- kernel/sched/sched.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 5b2b919c7929..da13e834e990 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -248,13 +248,6 @@ const struct sched_class fair_sched_class; */ #ifdef CONFIG_FAIR_GROUP_SCHED - -/* cpu runqueue to which this cfs_rq is attached */ -static inline struct rq *rq_of(struct cfs_rq *cfs_rq) -{ - return cfs_rq->rq; -} - static inline struct task_struct *task_of(struct sched_entity *se) { SCHED_WARN_ON(!entity_is_task(se)); @@ -410,12 +403,6 @@ static inline struct task_struct *task_of(struct sched_entity *se) return container_of(se, struct task_struct, se); } -static inline struct rq *rq_of(struct cfs_rq *cfs_rq) -{ - return container_of(cfs_rq, struct rq, cfs); -} - - #define for_each_sched_entity(se) \ for (; se; se = NULL) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index d27c1a5d4e25..0ed130fae2a9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -951,6 +951,22 @@ struct rq { #endif }; +#ifdef CONFIG_FAIR_GROUP_SCHED + +/* CPU runqueue to which this cfs_rq is attached */ +static inline struct rq *rq_of(struct cfs_rq *cfs_rq) +{ + return cfs_rq->rq; +} + +#else + +static inline struct rq *rq_of(struct cfs_rq *cfs_rq) +{ + return container_of(cfs_rq, struct rq, cfs); +} +#endif + static inline int cpu_of(struct rq *rq) { #ifdef CONFIG_SMP
