linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / dec / int-handler.S

diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 455a65b..41fa372 100644 (file)
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -13,6 +13,7 @@
  * Rewritten extensively for controller-driven IRQ support
  * by Maciej W. Rozycki.
  */
+#include <linux/config.h>
 
 #include <asm/addrspace.h>
 #include <asm/asm.h>
@@ -35,7 +36,7 @@
                .text
                .set    noreorder
 /*
- * plat_irq_dispatch: Interrupt handler for DECstations
+ * decstation_handle_int: 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:
@@ -124,7 +125,11 @@
  * just take another exception, big deal.
  */
                .align  5
-               NESTED(plat_irq_dispatch, PT_SIZE, ra)
+               NESTED(decstation_handle_int, PT_SIZE, ra)
+               .set    noat
+               SAVE_ALL
+               CLI                             # TEST: interrupts should be off
+               .set    at
                .set    noreorder
 
                /*
@@ -277,11 +282,9 @@ fpu:
 #endif
 
 spurious:
-               jal     spurious_interrupt
+               j       spurious_interrupt
                 nop
-               j       ret_from_irq
-                nop
-               END(plat_irq_dispatch)
+               END(decstation_handle_int)
 
 /*
  * Generic unimplemented interrupt routines -- cpu_mask_nr_tbl