Commit ad607cd6 authored May 04, 2016 by Steve Muckle Committed by John Stultz Sep 09, 2016

arm: Fix build error "conflicting types for 'scale_cpu_capacity'"



Commit "arm: Update arch_scale_cpu_capacity() to reflect change to
define" introduced a dependency on struct sched_domain in
arch/arm/include/asm/topologoy.h, but that structure is only currently
defined if CONFIG_CPU_FREQ is enabled, which causes
include/linux/cpufreq.h to get pulled in which defines it.

Include <linux/cpufreq.h> regardless of CONFIG_CPU_FREQ so struct
sched_domain is always defined.

Fixes: Change-Id: I372bd5e4c1e203428d72b18c8a806b06f3567ef6
       ("arm: Update arch_scale_cpu_capacity() to reflect change to define")
Signed-off-by: Steve Muckle <smuckle@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
[jstultz: Cherry-picked from android-3.18]
Signed-off-by: John Stultz <john.stultz@linaro.org>

parent aeb4a311

arch/arm/include/asm/topology.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@

	#ifdef CONFIG_ARM_CPU_TOPOLOGY		#ifdef CONFIG_ARM_CPU_TOPOLOGY

			#include <linux/cpufreq.h>
	#include <linux/cpumask.h>		#include <linux/cpumask.h>

	struct cputopo_arm {		struct cputopo_arm {
	@@ -25,7 +26,6 @@ void store_cpu_topology(unsigned int cpuid);
	const struct cpumask *cpu_coregroup_mask(int cpu);		const struct cpumask *cpu_coregroup_mask(int cpu);

	#ifdef CONFIG_CPU_FREQ		#ifdef CONFIG_CPU_FREQ
	#include <linux/cpufreq.h>
	#define arch_scale_freq_capacity cpufreq_scale_freq_capacity		#define arch_scale_freq_capacity cpufreq_scale_freq_capacity
	#endif		#endif
	#define arch_scale_cpu_capacity scale_cpu_capacity		#define arch_scale_cpu_capacity scale_cpu_capacity