sched/fair: Move the rq_of() helper function (62478d99) · Commits · 戴 / test

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.guittot@linaro.org> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Morten.Rasmussen@arm.com Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: bsegall@google.com Cc: dietmar.eggemann@arm.com Cc: patrick.bellasi@arm.com Cc: pjt@google.com Cc: pkondeti@codeaurora.org Cc: quentin.perret@arm.com Cc: rjw@rjwysocki.net Cc: srinivas.pandruvada@linux.intel.com Cc: thara.gopinath@linaro.org Link: https://lkml.kernel.org/r/1548257214-13745-2-git-send-email-vincent.guittot@linaro.org Signed-off-by:

Ingo Molnar <mingo@kernel.org>

kernel/sched/fair.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -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)

kernel/sched/sched.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -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

Admin message