Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
  Fix IRQ flag handling naming
  MIPS: Add missing #inclusions of <linux/irq.h>
  smc91x: Add missing #inclusion of <linux/irq.h>
  Drop a couple of unnecessary asm/system.h inclusions
  SH: Add missing consts to sys_execve() declaration
  Blackfin: Rename IRQ flags handling functions
  Blackfin: Add missing dep to asm/irqflags.h
  Blackfin: Rename DES PC2() symbol to avoid collision
  Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
  Blackfin: Split PLL code from mach-specific cdef headers

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index cfeb2c155896..39c08254b0f1 100644
--- 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);