summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/topology.h
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-09-08 17:02:15 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-09-08 17:07:42 -0700
commit341e02d8bbeeda14cfc946ffbcb492dc9823487b (patch)
treea46f6c9f2483a7c3e64730b5dbde202dc2678efc /arch/arm/include/asm/topology.h
parenta38338f1cd595f6a66870ba46cc6a4ae7378c084 (diff)
parent81330959ee15a682fbefcdd4f5350a979d8e8fdb (diff)
Merge remote-tracking branch 'linaro-ext/EAS/v4.4-easv5.2+aosp-changes' into android-4.4
Change-Id: Ic24b43ee867bc4f70b31bedaad734717b64b86a1
Diffstat (limited to 'arch/arm/include/asm/topology.h')
-rw-r--r--arch/arm/include/asm/topology.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index 370f7a732900..e3e596cbb1a7 100644
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h
@@ -24,6 +24,13 @@ void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
const struct cpumask *cpu_coregroup_mask(int cpu);
+#ifdef CONFIG_CPU_FREQ
+#include <linux/cpufreq.h>
+#define arch_scale_freq_capacity cpufreq_scale_freq_capacity
+#endif
+#define arch_scale_cpu_capacity scale_cpu_capacity
+extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu);
+
#else
static inline void init_cpu_topology(void) { }