Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into linux-linaro-lsk

Conflicts:
	arch/arm64/kernel/topology.c

diff --cc arch/arm64/include/asm/topology.h
index 983fa7c153a27bec6fec1998457816eef3c1412e,58b8b84adcd2cf5f295e6869b68350f9dcadc798..5692ba11322d494ece74118cad07378b3714d31b
--- 1/arch/arm64/include/asm/topology.h
--- 2/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@@ -26,39 -26,7 +26,38 @@@ extern struct cputopo_arm cpu_topology[
  void init_cpu_topology(void);
  void store_cpu_topology(unsigned int cpuid);
  const struct cpumask *cpu_coregroup_mask(int cpu);
- int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask);
  
 +#ifdef CONFIG_DISABLE_CPU_SCHED_DOMAIN_BALANCE
 +/* Common values for CPUs */
 +#ifndef SD_CPU_INIT
 +#define SD_CPU_INIT (struct sched_domain) {                           \
 +      .min_interval           = 1,                                    \
 +      .max_interval           = 4,                                    \
 +      .busy_factor            = 64,                                   \
 +      .imbalance_pct          = 125,                                  \
 +      .cache_nice_tries       = 1,                                    \
 +      .busy_idx               = 2,                                    \
 +      .idle_idx               = 1,                                    \
 +      .newidle_idx            = 0,                                    \
 +      .wake_idx               = 0,                                    \
 +      .forkexec_idx           = 0,                                    \
 +                                                                      \
 +      .flags                  = 0*SD_LOAD_BALANCE                     \
 +                              | 1*SD_BALANCE_NEWIDLE                  \
 +                              | 1*SD_BALANCE_EXEC                     \
 +                              | 1*SD_BALANCE_FORK                     \
 +                              | 0*SD_BALANCE_WAKE                     \
 +                              | 1*SD_WAKE_AFFINE                      \
 +                              | 0*SD_SHARE_CPUPOWER                   \
 +                              | 0*SD_SHARE_PKG_RESOURCES              \
 +                              | 0*SD_SERIALIZE                        \
 +                              ,                                       \
 +      .last_balance            = jiffies,                             \
 +      .balance_interval       = 1,                                    \
 +}
 +#endif
 +#endif /* CONFIG_DISABLE_CPU_SCHED_DOMAIN_BALANCE */
 +
  #else
  
  static inline void init_cpu_topology(void) { }

diff --cc arch/arm64/kernel/topology.c
index 971064a0c6b42a8f99748e8bb0ba2696417d547f,cb6e0397bec72eadbcbf7231dd2e95054c8f153e..4095d01995b03df0626c4b33d3cbf8abf30c9f7a
--- 1/arch/arm64/kernel/topology.c
--- 2/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@@ -22,9 -21,7 +21,10 @@@
  #include <linux/sched.h>
  #include <linux/slab.h>
  
- #include <asm/topology.h>
+ #include <asm/topology.h>
 +#include <asm/cputype.h>
 +#include <asm/smp_plat.h>
++
  
  /*
   * cpu power scale management