X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fdec%2Fint-handler.S;fp=arch%2Fmips%2Fdec%2Fint-handler.S;h=41fa372007bf07889f2facffc6edfd76f8287ff9;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=455a65b91cb0b707e3656cc450238ae5f45a73cd;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 455a65b91..41fa37200 100644
--- 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