Merge branch 'master'

1 files changed, 0 insertions, 14 deletions

diff --git a/arch/mips/mips-boards/sim/sim_smp.c b/arch/mips/mips-boards/sim/sim_smp.c
index a9f0c2bfe4ad..b7084e7c4bf9 100644
--- a/arch/mips/mips-boards/sim/sim_smp.c
+++ b/arch/mips/mips-boards/sim/sim_smp.c
@@ -44,8 +44,6 @@
 void core_send_ipi(int cpu, unsigned int action)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
-        void smtc_send_ipi(int, int, unsigned int);
-
         smtc_send_ipi(cpu, LINUX_SMP_IPI, action);
 #endif /* CONFIG_MIPS_MT_SMTC */
 /* "CPU" may be TC of same VPE, VPE of same CPU, or different CPU */
@@ -59,15 +57,8 @@ void core_send_ipi(int cpu, unsigned int action)
 void __init prom_build_cpu_map(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
-        extern int mipsmt_build_cpu_map(int startslot);
         int nextslot;
 
-        cpus_clear(phys_cpu_present_map);
-
-        /* Register the boot CPU */
-
-        smp_prepare_boot_cpu();
-
         /*
          * As of November, 2004, MIPSsim only simulates one core
          * at a time.  However, that core may be a MIPS MT core
@@ -87,8 +78,6 @@ void __init prom_build_cpu_map(void)
 void prom_boot_secondary(int cpu, struct task_struct *idle)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
-        extern void smtc_boot_secondary(int cpu, struct task_struct *t);
-
         smtc_boot_secondary(cpu, idle);
 #endif /* CONFIG_MIPS_MT_SMTC */
 }
@@ -113,7 +102,6 @@ void prom_init_secondary(void)
 void prom_prepare_cpus(unsigned int max_cpus)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
-        void mipsmt_prepare_cpus(int c);
         /*
          * As noted above, we can assume a single CPU for now
          * but it may be multithreaded.
@@ -132,8 +120,6 @@ void prom_prepare_cpus(unsigned int max_cpus)
 void prom_smp_finish(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
-        void smtc_smp_finish(void);
-
         smtc_smp_finish();
 #endif /* CONFIG_MIPS_MT_SMTC */
 }