Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 8 deletions

diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 41fa372007bf..e8ec93e33fe6 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -36,7 +36,7 @@
                 .text
                 .set    noreorder
 /*
- * decstation_handle_int: Interrupt handler for DECstations
+ * plat_irq_dispatch: Interrupt handler for DECstations
  *
  * We follow the model in the Indy interrupt code by David Miller, where he
  * says: a lot of complication here is taken away because:
@@ -125,11 +125,7 @@
  * just take another exception, big deal.
  */
                 .align  5
-                NESTED(decstation_handle_int, PT_SIZE, ra)
-                .set    noat
-                SAVE_ALL
-                CLI                             # TEST: interrupts should be off
-                .set    at
+                NESTED(plat_irq_dispatch, PT_SIZE, ra)
                 .set    noreorder
 
                 /*
@@ -282,9 +278,11 @@ fpu:
 #endif
 
 spurious:
-                j       spurious_interrupt
+                jal     spurious_interrupt
                  nop
-                END(decstation_handle_int)
+                j       ret_from_irq
+                 nop
+                END(plat_irq_dispatch)
 
 /*
  * Generic unimplemented interrupt routines -- cpu_mask_nr_tbl