sched/topology: Relocate arch_scale_cpu_capacity() to the internal header (5bd0988b) · Commits · 戴 / test

By default, arch_scale_cpu_capacity() is only visible from within the kernel/sched folder. Relocate it to include/linux/sched/topology.h to make it visible to other clients needing to know about the capacity of CPUs, such as the Energy Model framework. This also shrinks the <linux/sched/topology.h> public header. Signed-off-by:

Quentin Perret <quentin.perret@arm.com> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: adharmap@codeaurora.org Cc: chris.redpath@arm.com Cc: currojerez@riseup.net Cc: dietmar.eggemann@arm.com Cc: edubezval@gmail.com Cc: gregkh@linuxfoundation.org Cc: javi.merino@kernel.org Cc: joel@joelfernandes.org Cc: juri.lelli@redhat.com Cc: morten.rasmussen@arm.com Cc: patrick.bellasi@arm.com Cc: pkondeti@codeaurora.org Cc: rjw@rjwysocki.net Cc: skannan@codeaurora.org Cc: smuckle@google.com Cc: srinivas.pandruvada@linux.intel.com Cc: thara.gopinath@linaro.org Cc: tkjos@google.com Cc: valentin.schneider@arm.com Cc: vincent.guittot@linaro.org Cc: viresh.kumar@linaro.org Link: https://lkml.kernel.org/r/20181203095628.11858-2-quentin.perret@arm.com Signed-off-by:

Ingo Molnar <mingo@kernel.org>

include/linux/sched/topology.h

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -201,6 +201,14 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl);
	# define SD_INIT_NAME(type)		# define SD_INIT_NAME(type)
	#endif		#endif

			#ifndef arch_scale_cpu_capacity
			static __always_inline
			unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
			{
			return SCHED_CAPACITY_SCALE;
			}
			#endif

	#else /* CONFIG_SMP */		#else /* CONFIG_SMP */

	struct sched_domain_attr;		struct sched_domain_attr;
	@@ -216,6 +224,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu)
	return true;		return true;
	}		}

			#ifndef arch_scale_cpu_capacity
			static __always_inline
			unsigned long arch_scale_cpu_capacity(void __always_unused *sd, int cpu)
			{
			return SCHED_CAPACITY_SCALE;
			}
			#endif

	#endif /* !CONFIG_SMP */		#endif /* !CONFIG_SMP */

	static inline int task_node(const struct task_struct *p)		static inline int task_node(const struct task_struct *p)

kernel/sched/sched.h

+0 −18

Original line number	Original line	Diff line number	Diff line
	@@ -1859,24 +1859,6 @@ unsigned long arch_scale_freq_capacity(int cpu)
	}		}
	#endif		#endif

	#ifdef CONFIG_SMP
	#ifndef arch_scale_cpu_capacity
	static __always_inline
	unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
	{
	return SCHED_CAPACITY_SCALE;
	}
	#endif
	#else
	#ifndef arch_scale_cpu_capacity
	static __always_inline
	unsigned long arch_scale_cpu_capacity(void __always_unused *sd, int cpu)
	{
	return SCHED_CAPACITY_SCALE;
	}
	#endif
	#endif

	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP
	#ifdef CONFIG_PREEMPT		#ifdef CONFIG_PREEMPT

Admin message