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

Conflicts:
	arch/arm64/kernel/smp.c

diff --cc arch/arm64/Kconfig
index dba7308041ad77ea2cf05c59d35c39494d8e55b8,022f20097930e5a8c2f64248e34c2812eb6f3167..40bbfe5605519eb66cbed052632e26354db800ee
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -151,9 -148,15 +151,16 @@@ config NR_CPU
        int "Maximum number of CPUs (2-32)"
        range 2 32
        depends on SMP
 -      default "4"
 +      # These have to remain sorted largest to smallest
 +      default "8"
  
+ config HOTPLUG_CPU
+       bool "Support for hot-pluggable CPUs"
+       depends on SMP
+       help
+         Say Y here to experiment with turning CPUs off and on.  CPUs
+         can be controlled through /sys/devices/system/cpu.
+ 
  source kernel/Kconfig.preempt
  
  config HZ

diff --cc arch/arm64/kernel/head.S
Simple merge

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

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

diff --cc arch/arm64/kernel/smp.c
index 97eaf79319d5b53914853f4de57242a6e540cc4e,e0b7c0e45b870a663e07c840dfdd5d683643bede..53ed158ec31cb8c517c07798c281b2da6811dd5c
--- 1/arch/arm64/kernel/smp.c
--- 2/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -187,18 -142,16 +142,9 @@@ asmlinkage void __cpuinit secondary_sta
        preempt_disable();
        trace_hardirqs_off();
  
-       /*
-        * Let the primary processor know we're out of the
-        * pen, then head off into the C entry point
-        */
-       write_pen_release(INVALID_HWID);
- 
-       /*
-        * Synchronise with the boot thread.
-        */
-       raw_spin_lock(&boot_lock);
-       raw_spin_unlock(&boot_lock);
+       if (cpu_ops[cpu]->cpu_postboot)
+               cpu_ops[cpu]->cpu_postboot();
  
 -      /*
 -       * Enable local interrupts.
 -       */
 -      notify_cpu_starting(cpu);
 -      local_irq_enable();
 -      local_fiq_enable();
 -
        /*
         * OK, now it's safe to let the boot CPU continue.  Wait for
         * the CPU migration code to notice that the CPU is online

diff --cc arch/arm64/kernel/vmlinux.lds.S
Simple merge