diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-04-01 15:17:45 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-04-18 22:14:18 -0400 |
commit | 93373ed4d87fb02554ce020d929388ac16913664 (patch) | |
tree | 01925421619219d00c39744b0a4cc79b8f7f719b /arch/mips/ddb5xxx | |
parent | c9e321e095384f25f2b7ffef456794cfa876dafc (diff) |
[MIPS] Rewrite spurious_interrupt from assembler to C.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ddb5xxx')
-rw-r--r-- | arch/mips/ddb5xxx/ddb5476/int-handler.S | 3 | ||||
-rw-r--r-- | arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c | 4 | ||||
-rw-r--r-- | arch/mips/ddb5xxx/ddb5477/int-handler.S | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/mips/ddb5xxx/ddb5476/int-handler.S b/arch/mips/ddb5xxx/ddb5476/int-handler.S index 12c292e189ba..0c2bdae96bb1 100644 --- a/arch/mips/ddb5xxx/ddb5476/int-handler.S +++ b/arch/mips/ddb5xxx/ddb5476/int-handler.S | |||
@@ -54,7 +54,8 @@ | |||
54 | .set reorder | 54 | .set reorder |
55 | 55 | ||
56 | /* wrong alarm or masked ... */ | 56 | /* wrong alarm or masked ... */ |
57 | // j spurious_interrupt | 57 | // jal spurious_interrupt |
58 | // j ret_from_irq | ||
58 | move a0, sp | 59 | move a0, sp |
59 | jal vrc5476_irq_dispatch | 60 | jal vrc5476_irq_dispatch |
60 | j ret_from_irq | 61 | j ret_from_irq |
diff --git a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c index f66fe5b58636..581eabad5f82 100644 --- a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c +++ b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c | |||
@@ -80,8 +80,6 @@ vrc5476_irq_init(u32 base) | |||
80 | asmlinkage void | 80 | asmlinkage void |
81 | vrc5476_irq_dispatch(struct pt_regs *regs) | 81 | vrc5476_irq_dispatch(struct pt_regs *regs) |
82 | { | 82 | { |
83 | extern void spurious_interrupt(void); | ||
84 | |||
85 | u32 mask; | 83 | u32 mask; |
86 | int nile4_irq; | 84 | int nile4_irq; |
87 | 85 | ||
@@ -107,5 +105,5 @@ vrc5476_irq_dispatch(struct pt_regs *regs) | |||
107 | return; | 105 | return; |
108 | } | 106 | } |
109 | } | 107 | } |
110 | spurious_interrupt(); | 108 | spurious_interrupt(regs); |
111 | } | 109 | } |
diff --git a/arch/mips/ddb5xxx/ddb5477/int-handler.S b/arch/mips/ddb5xxx/ddb5477/int-handler.S index a2502a14400e..9884874dbeb5 100644 --- a/arch/mips/ddb5xxx/ddb5477/int-handler.S +++ b/arch/mips/ddb5xxx/ddb5477/int-handler.S | |||
@@ -44,8 +44,8 @@ | |||
44 | .set reorder | 44 | .set reorder |
45 | 45 | ||
46 | /* wrong alarm or masked ... */ | 46 | /* wrong alarm or masked ... */ |
47 | j spurious_interrupt | 47 | jal spurious_interrupt |
48 | nop | 48 | j ret_from_irq |
49 | END(ddb5477_handle_int) | 49 | END(ddb5477_handle_int) |
50 | 50 | ||
51 | .align 5 | 51 | .align 5 |