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

Conflicts:
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/topology.c

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/topology.h
Simple merge

diff --cc arch/arm64/kernel/Makefile
index c6172392b20df25b893ccd133c23b9f4cca8cf64,5a9ed500704fc909fa661271822171dbd68898ed..79008f6315aab06de59ab62f84d12614f3566063
--- 1/arch/arm64/kernel/Makefile
--- 2/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -14,7 -14,8 +14,8 @@@ arm64-obj-y           := cputable.o debug-monito
  arm64-obj-$(CONFIG_COMPAT)            += sys32.o kuser32.o signal32.o         \
                                           sys_compat.o
  arm64-obj-$(CONFIG_MODULES)           += arm64ksyms.o module.o
 -arm64-obj-$(CONFIG_SMP)                       += smp.o smp_spin_table.o smp_psci.o
 +arm64-obj-$(CONFIG_SMP)                       += smp.o smp_spin_table.o
+ arm64-obj-$(CONFIG_SMP)                       += topology.o
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)    += perf_event.o
  arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
  arm64-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o

diff --cc arch/arm64/kernel/smp.c
Simple merge

diff --cc arch/arm64/kernel/topology.c
index 0460ba0573f8a9fc99e543bbb0779e80630cd852,49c94ff29479066c8004814536e447fe388ab6f3..db8bb29c3852cc06e05e59874915f3673ca717db
--- 1/arch/arm64/kernel/topology.c
--- 2/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@@ -21,15 -22,9 +22,11 @@@
  #include <linux/sched.h>
  #include <linux/slab.h>
  
- #include <asm/topology.h>
 -#include <asm/smp_plat.h>
 +#include <asm/cputype.h>
+ #include <asm/topology.h>
 +#include <asm/smp_plat.h>
 +
  
- /*
-  * cpu power scale management
-  */
- 
  /*
   * cpu power table
   * This per cpu data structure describes the relative capacity of each core.