Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: 64-bit: Fix system lockup.
  MIPS: IP28: Change to build with -mr10k-cache-barrier=store
  MIPS: IP22: Fix hang in power button interrupt handler
  MIPS: IP32: Fix hang on shutdown in power button interrupt handler.

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index b6cab089561e..667da932b7b2 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -145,7 +145,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
                         "%s: RTC IRQ without RTC_IRQF\n", __func__);
         }
         /* Wait until interrupt goes away */
-        disable_irq(MACEISA_RTC_IRQ);
+        disable_irq_nosync(MACEISA_RTC_IRQ);
         init_timer(&debounce_timer);
         debounce_timer.function = debounce;
         debounce_timer.expires = jiffies + 50;