3 files changed, 3 insertions, 90 deletions

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 0c6877ea9004..fdaf65e1a99d 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Linux/MIPS kernel.
 #
 
-extra-y         := head.o init_task.o vmlinux.lds
+extra-y         := head.o vmlinux.lds
 
 obj-y           += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
                    ptrace.o reset.o setup.o signal.o syscall.o \
diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c
deleted file mode 100644
index 5f9a76263c9a..000000000000
--- a/arch/mips/kernel/init_task.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <linux/mm.h>
-#include <linux/export.h>
-#include <linux/sched.h>
-#include <linux/init_task.h>
-#include <linux/fs.h>
-#include <linux/mqueue.h>
-
-#include <asm/thread_info.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-/*
- * Initial thread structure.
- *
- * We need to make sure that this is 8192-byte aligned due to the
- * way process stacks are handled. This is done by making sure
- * the linker maps this in the .text segment right after head.S,
- * and making head.S ensure the proper alignment.
- *
- * The things we do for performance..
- */
-union thread_union init_thread_union __init_task_data
-        __attribute__((__aligned__(THREAD_SIZE))) =
-                { INIT_THREAD_INFO(init_task) };
-
-/*
- * Initial task structure.
- *
- * All other task structs will be allocated on slabs in fork.c
- */
-struct task_struct init_task = INIT_TASK(init_task);
-
-EXPORT_SYMBOL(init_task);
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index ba9376bf52a1..71a95f55a649 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -186,61 +186,9 @@ void __devinit smp_prepare_boot_cpu(void)
         cpu_set(0, cpu_callin_map);
 }
 
-/*
- * Called once for each "cpu_possible(cpu)".  Needs to spin up the cpu
- * and keep control until "cpu_online(cpu)" is set.  Note: cpu is
- * physical, not logical.
- */
-static struct task_struct *cpu_idle_thread[NR_CPUS];
-
-struct create_idle {
-        struct work_struct work;
-        struct task_struct *idle;
-        struct completion done;
-        int cpu;
-};
-
-static void __cpuinit do_fork_idle(struct work_struct *work)
-{
-        struct create_idle *c_idle =
-                container_of(work, struct create_idle, work);
-
-        c_idle->idle = fork_idle(c_idle->cpu);
-        complete(&c_idle->done);
-}
-
-int __cpuinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
 {
-        struct task_struct *idle;
-
-        /*
-         * Processor goes to start_secondary(), sets online flag
-         * The following code is purely to make sure
-         * Linux can schedule processes on this slave.
-         */
-        if (!cpu_idle_thread[cpu]) {
-                /*
-                 * Schedule work item to avoid forking user task
-                 * Ported from arch/x86/kernel/smpboot.c
-                 */
-                struct create_idle c_idle = {
-                        .cpu    = cpu,
-                        .done   = COMPLETION_INITIALIZER_ONSTACK(c_idle.done),
-                };
-
-                INIT_WORK_ONSTACK(&c_idle.work, do_fork_idle);
-                schedule_work(&c_idle.work);
-                wait_for_completion(&c_idle.done);
-                idle = cpu_idle_thread[cpu] = c_idle.idle;
-
-                if (IS_ERR(idle))
-                        panic(KERN_ERR "Fork failed for CPU %d", cpu);
-        } else {
-                idle = cpu_idle_thread[cpu];
-                init_idle(idle, cpu);
-        }
-
-        mp_ops->boot_secondary(cpu, idle);
+        mp_ops->boot_secondary(cpu, tidle);
 
         /*
          * Trust is futile.  We should really have timeouts ...