diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-04-03 13:21:41 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2013-04-03 13:21:41 +0530 |
| commit | 9a379826b40b6b9197898471c93271d1b7b6b191 (patch) | |
| tree | 9591d207288ccc5fe0d68afac3b5e6ecddd026ae /arch | |
| parent | bfda28f13595b04821270528907fb74a2c439705 (diff) | |
| parent | d737f110373eb6201ee01eaaf8773bbc85ebaa1a (diff) | |
Merge branch 'upstream-sched-pack-small-tasks-v3' into big-LITTLE-MP-upstream-v2
Conflicts:
kernel/sched/sched.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/topology.c | 9 | ||||
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 1 | ||||
| -rw-r--r-- | arch/tile/include/asm/topology.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 79282ebcd93..f89a4a2b6ed 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -201,6 +201,15 @@ static inline void update_cpu_power(unsigned int cpuid, unsigned int mpidr) {} */ struct cputopo_arm cpu_topology[NR_CPUS]; +int arch_sd_local_flags(int level) +{ + /* Powergate at threading level doesn't make sense */ + if (level & SD_SHARE_CPUPOWER) + return 1*SD_SHARE_POWERDOMAIN; + + return 0*SD_SHARE_POWERDOMAIN; +} + const struct cpumask *cpu_coregroup_mask(int cpu) { return &cpu_topology[cpu].core_sibling; diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index a2496e449b7..6d0b61741c1 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h @@ -65,6 +65,7 @@ void build_cpu_to_node_map(void); | SD_BALANCE_EXEC \ | SD_BALANCE_FORK \ | SD_WAKE_AFFINE, \ + | arch_sd_local_flags(0)\ .last_balance = jiffies, \ .balance_interval = 1, \ .nr_balance_failed = 0, \ diff --git a/arch/tile/include/asm/topology.h b/arch/tile/include/asm/topology.h index d5e86c9f74f..adc871020d4 100644 --- a/arch/tile/include/asm/topology.h +++ b/arch/tile/include/asm/topology.h @@ -71,6 +71,7 @@ static inline const struct cpumask *cpumask_of_node(int node) | 0*SD_WAKE_AFFINE \ | 0*SD_SHARE_CPUPOWER \ | 0*SD_SHARE_PKG_RESOURCES \ + | arch_sd_local_flags(0) \ | 0*SD_SERIALIZE \ , \ .last_balance = jiffies, \ |