1 files changed, 9 insertions, 7 deletions

diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mips-boards/malta/malta_smtc.c
index 0fb4c269901c..ae05d058cb37 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -1,6 +1,7 @@
 /*
  * Malta Platform-specific hooks for SMP operation
  */
+#include <linux/irq.h>
 #include <linux/init.h>
 
 #include <asm/mipsregs.h>
@@ -24,7 +25,7 @@ void core_send_ipi(int cpu, unsigned int action)
  * Platform "CPU" startup hook
  */
 
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
         smtc_boot_secondary(cpu, idle);
 }
@@ -33,7 +34,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
  * Post-config but pre-boot cleanup entry point
  */
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
         void smtc_init_secondary(void);
         int myvpe;
@@ -42,10 +43,11 @@ void prom_init_secondary(void)
         myvpe = read_c0_tcbind() & TCBIND_CURVPE;
         if (myvpe != 0) {
                 /* Ideally, this should be done only once per VPE, but... */
-                clear_c0_status(STATUSF_IP2);
-                set_c0_status(STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP3
-                                | STATUSF_IP4 | STATUSF_IP5 | STATUSF_IP6
-                                | STATUSF_IP7);
+                clear_c0_status(ST0_IM);
+                set_c0_status((0x100 << cp0_compare_irq)
+                                | (0x100 << MIPS_CPU_IPI_IRQ));
+                if (cp0_perfcount_irq >= 0)
+                        set_c0_status(0x100 << cp0_perfcount_irq);
         }
 
         smtc_init_secondary();
@@ -74,7 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * SMP initialization finalization entry point
  */
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
         smtc_smp_finish();
 }