Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / sun4d_smp.c

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index f9a1a33cbb2c9134cc1f152ac2308acd3d88f133..ddaea31de586d47e72c013a565000bdec6a9645f 100644 (file)
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -129,18 +129,14 @@ void __init smp4d_boot_cpus(void)
        local_ops->cache_all();
 }
 
-int __cpuinit smp4d_boot_one_cpu(int i)
+int __cpuinit smp4d_boot_one_cpu(int i, struct task_struct *idle)
 {
        unsigned long *entry = &sun4d_cpu_startup;
-       struct task_struct *p;
        int timeout;
        int cpu_node;
 
        cpu_find_by_instance(i, &cpu_node, NULL);
-       /* Cook up an idler for this guy. */
-       p = fork_idle(i);
-       current_set[i] = task_thread_info(p);
-
+       current_set[i] = task_thread_info(idle);
        /*
         * Initialize the contexts table
         * Since the call to prom_startcpu() trashes the structure,