diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-13 14:47:50 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-13 14:47:50 -0700 |
| commit | 441e10ac4ca3a476d76091a1bd250ac4ff7306c5 (patch) | |
| tree | a76b65a8ff5dd552f0582e620b964df0b5026f17 /arch/arm/include | |
| parent | 2a3670c62203b1a11b496ec6585393b8abf9736f (diff) | |
| parent | 1510827f29ced43ac686c4625ce709e0dfb1292d (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/topology.h | 7 |
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..d06064120694 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -3,6 +3,7 @@ #ifdef CONFIG_ARM_CPU_TOPOLOGY +#include <linux/cpufreq.h> #include <linux/cpumask.h> struct cputopo_arm { @@ -24,6 +25,12 @@ void init_cpu_topology(void); void store_cpu_topology(unsigned int cpuid); const struct cpumask *cpu_coregroup_mask(int cpu); +#ifdef CONFIG_CPU_FREQ +#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) { } |