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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kernel/Makefile
Simple merge

diff --cc arch/arm64/kernel/smp.c
index 8d8a1f2af29a9e21f6f79ce5e7233d2144068e7c,e0b7c0e45b870a663e07c840dfdd5d683643bede..5e9d27442fbb03204d2482727cd9bbc50fd4a3c9
--- 1/arch/arm64/kernel/smp.c
--- 2/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -393,14 -387,9 +397,14 @@@ next
  
  void __init smp_prepare_cpus(unsigned int max_cpus)
  {
-       int cpu, err;
-       unsigned int ncores = num_possible_cpus();
+       int err;
+       unsigned int cpu, ncores = num_possible_cpus();
  
 +      init_cpu_topology();
 +
 +      smp_store_cpu_info(smp_processor_id());
 +
 +
        /*
         * are we trying to boot more cores than exist?
         */