Merge branch 'master' into tk71

[mv-sheeva.git] / arch / mips / kernel / smtc.c

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index cfeb2c1558967a540df6be261478df57c73a440f..39c08254b0f16f7d36e1b73344cb75c52ed9619f 100644 (file)
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1038,7 +1038,7 @@ void deferred_smtc_ipi(void)
                 * but it's more efficient, given that we're already
                 * running down the IPI queue.
                 */
-               __raw_local_irq_restore(flags);
+               __arch_local_irq_restore(flags);
        }
 }
 
@@ -1190,7 +1190,7 @@ void smtc_ipi_replay(void)
                /*
                 ** But use a raw restore here to avoid recursion.
                 */
-               __raw_local_irq_restore(flags);
+               __arch_local_irq_restore(flags);
 
                if (pipi) {
                        self_ipi(pipi);