Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[deliverable/linux.git] / arch / arm / mach-shmobile / platsmp-scu.c

diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
index c96f50160be69eb8c0be9798c95374e664163615..673ad6e808694f1cab787fe6430090900efc8150 100644 (file)
--- a/arch/arm/mach-shmobile/platsmp-scu.c
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/cpu.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/io.h>
@@ -16,6 +17,26 @@
 #include <asm/smp_scu.h>
 #include <mach/common.h>
 
+static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
+                                         unsigned long action, void *hcpu)
+{
+       unsigned int cpu = (long)hcpu;
+
+       switch (action) {
+       case CPU_UP_PREPARE:
+               /* For this particular CPU register SCU SMP boot vector */
+               shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
+                                 (unsigned long)shmobile_scu_base);
+               break;
+       };
+
+       return NOTIFY_OK;
+}
+
+static struct notifier_block shmobile_smp_scu_notifier = {
+       .notifier_call = shmobile_smp_scu_notifier_call,
+};
+
 void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus)
 {
        /* install boot code shared by all CPUs */
@@ -25,14 +46,9 @@ void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus)
        /* enable SCU and cache coherency on booting CPU */
        scu_enable(shmobile_scu_base);
        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
-}
 
-int shmobile_smp_scu_boot_secondary(unsigned int cpu, struct task_struct *idle)
-{
-       /* For this particular CPU register SCU boot vector */
-       shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
-                         (unsigned long)shmobile_scu_base);
-       return 0;
+       /* Use CPU notifier for reset vector control */
+       register_cpu_notifier(&shmobile_smp_scu_notifier);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU