2 files changed, 2 insertions, 12 deletions

diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
index 7b60faccd551..f30c52843396 100644
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -30,7 +30,7 @@ void __ref highbank_cpu_die(unsigned int cpu)
 {
         flush_cache_all();
 
-        highbank_set_cpu_jump(cpu, secondary_startup);
+        highbank_set_cpu_jump(cpu, phys_to_virt(0));
         highbank_set_core_pwr();
 
         cpu_do_idle();
diff --git a/arch/arm/mach-highbank/platsmp.c b/arch/arm/mach-highbank/platsmp.c
index 1129957f6c1d..4ecc864ac8b9 100644
--- a/arch/arm/mach-highbank/platsmp.c
+++ b/arch/arm/mach-highbank/platsmp.c
@@ -32,6 +32,7 @@ static void __cpuinit highbank_secondary_init(unsigned int cpu)
 
 static int __cpuinit highbank_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
+        highbank_set_cpu_jump(cpu, secondary_startup);
         gic_raise_softirq(cpumask_of(cpu), 0);
         return 0;
 }
@@ -61,19 +62,8 @@ static void __init highbank_smp_init_cpus(void)
 
 static void __init highbank_smp_prepare_cpus(unsigned int max_cpus)
 {
-        int i;
-
         if (scu_base_addr)
                 scu_enable(scu_base_addr);
-
-        /*
-         * Write the address of secondary startup into the jump table
-         * The cores are in wfi and wait until they receive a soft interrupt
-         * and a non-zero value to jump to. Then the secondary CPU branches
-         * to this address.
-         */
-        for (i = 1; i < max_cpus; i++)
-                highbank_set_cpu_jump(i, secondary_startup);
 }
 
 struct smp_operations highbank_smp_ops __initdata = {