2 files changed, 8 insertions, 8 deletions

diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c
index 31180c321a1a..4b988b9a30d5 100644
--- a/arch/mips/mti-malta/malta-init.c
+++ b/arch/mips/mti-malta/malta-init.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/cacheflush.h>
+#include <asm/smp-ops.h>
 #include <asm/traps.h>
 
 #include <asm/gcmpregs.h>
@@ -358,15 +359,14 @@ void __init prom_init(void)
 #ifdef CONFIG_SERIAL_8250_CONSOLE
         console_config();
 #endif
-#ifdef CONFIG_MIPS_CMP
         /* Early detection of CMP support */
         if (gcmp_probe(GCMP_BASE_ADDR, GCMP_ADDRSPACE_SZ))
-                register_smp_ops(&cmp_smp_ops);
-        else
-#endif
-#ifdef CONFIG_MIPS_MT_SMP
-                register_smp_ops(&vsmp_smp_ops);
-#endif
+                if (!register_cmp_smp_ops())
+                        return;
+
+        if (!register_vsmp_smp_ops())
+                return;
+
 #ifdef CONFIG_MIPS_MT_SMTC
         register_smp_ops(&msmtc_smp_ops);
 #endif
diff --git a/arch/mips/mti-malta/malta-smtc.c b/arch/mips/mti-malta/malta-smtc.c
index 49a38b09a488..1efc8c394486 100644
--- a/arch/mips/mti-malta/malta-smtc.c
+++ b/arch/mips/mti-malta/malta-smtc.c
@@ -152,7 +152,7 @@ int plat_set_irq_affinity(struct irq_data *d, const struct cpumask *affinity,
                  * runtime code can anyway deal with the null set
                  */
                 printk(KERN_WARNING
-                        "IRQ affinity leaves no legal CPU for IRQ %d\n", irq);
+                       "IRQ affinity leaves no legal CPU for IRQ %d\n", d->irq);
 
         /* Do any generic SMTC IRQ affinity setup */
         smtc_set_irq_affinity(d->irq, tmask);