Merge tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux

[karo-tx-linux.git] / arch / sparc / kernel / smp_32.c

diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 57713758079e89435415cd69e475d7c9b3994ad3..79db45e5134a6df24de2805a597cc35c3b3cc347 100644 (file)
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -256,21 +256,21 @@ void __init smp_prepare_boot_cpu(void)
        set_cpu_possible(cpuid, true);
 }
 
-int __cpuinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
 {
-       extern int __cpuinit smp4m_boot_one_cpu(int);
-       extern int __cpuinit smp4d_boot_one_cpu(int);
+       extern int __cpuinit smp4m_boot_one_cpu(int, struct task_struct *);
+       extern int __cpuinit smp4d_boot_one_cpu(int, struct task_struct *);
        int ret=0;
 
        switch(sparc_cpu_model) {
        case sun4m:
-               ret = smp4m_boot_one_cpu(cpu);
+               ret = smp4m_boot_one_cpu(cpu, tidle);
                break;
        case sun4d:
-               ret = smp4d_boot_one_cpu(cpu);
+               ret = smp4d_boot_one_cpu(cpu, tidle);
                break;
        case sparc_leon:
-               ret = leon_boot_one_cpu(cpu);
+               ret = leon_boot_one_cpu(cpu, tidle);
                break;
        case sun4e:
                printk("SUN4E\n");