summaryrefslogtreecommitdiffstats
path: root/arch/mips/momentum
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-04-01 21:17:45 +0100
committerRalf Baechle <ralf@linux-mips.org>2006-04-19 04:14:18 +0200
commit93373ed4d87fb02554ce020d929388ac16913664 (patch)
tree01925421619219d00c39744b0a4cc79b8f7f719b /arch/mips/momentum
parentc9e321e095384f25f2b7ffef456794cfa876dafc (diff)
downloadlinux-93373ed4d87fb02554ce020d929388ac16913664.tar.bz2
[MIPS] Rewrite spurious_interrupt from assembler to C.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/momentum')
-rw-r--r--arch/mips/momentum/ocelot_3/int-handler.S4
-rw-r--r--arch/mips/momentum/ocelot_c/int-handler.S3
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/momentum/ocelot_3/int-handler.S b/arch/mips/momentum/ocelot_3/int-handler.S
index 4522f09ed769..b1207262984a 100644
--- a/arch/mips/momentum/ocelot_3/int-handler.S
+++ b/arch/mips/momentum/ocelot_3/int-handler.S
@@ -78,8 +78,10 @@
.set reorder
/* wrong alarm or masked ... */
- j spurious_interrupt
+ jal spurious_interrupt
nop
+ j ret_from_irq
+ nop
END(ocelot3_handle_int)
.align 5
diff --git a/arch/mips/momentum/ocelot_c/int-handler.S b/arch/mips/momentum/ocelot_c/int-handler.S
index 52349d9bf1be..f77834193c3c 100644
--- a/arch/mips/momentum/ocelot_c/int-handler.S
+++ b/arch/mips/momentum/ocelot_c/int-handler.S
@@ -52,8 +52,9 @@
.set reorder
/* wrong alarm or masked ... */
- j spurious_interrupt
+ jal spurious_interrupt
nop
+ j ret_from_irq
END(ocelot_handle_int)
.align 5