fbc1f826a8
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>
43 lines
1.1 KiB
C
43 lines
1.1 KiB
C
#ifndef _ASM_ARM_TOPOLOGY_H
|
|
#define _ASM_ARM_TOPOLOGY_H
|
|
|
|
#ifdef CONFIG_ARM_CPU_TOPOLOGY
|
|
|
|
#include <linux/cpufreq.h>
|
|
#include <linux/cpumask.h>
|
|
|
|
struct cputopo_arm {
|
|
int thread_id;
|
|
int core_id;
|
|
int socket_id;
|
|
cpumask_t thread_sibling;
|
|
cpumask_t core_sibling;
|
|
};
|
|
|
|
extern struct cputopo_arm cpu_topology[NR_CPUS];
|
|
|
|
#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id)
|
|
#define topology_core_id(cpu) (cpu_topology[cpu].core_id)
|
|
#define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling)
|
|
#define topology_sibling_cpumask(cpu) (&cpu_topology[cpu].thread_sibling)
|
|
|
|
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) { }
|
|
static inline void store_cpu_topology(unsigned int cpuid) { }
|
|
|
|
#endif
|
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
#endif /* _ASM_ARM_TOPOLOGY_H */
|