diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-10-07 14:44:33 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-10-07 21:38:28 -0400 |
commit | 937a801576f954bd030d7c4a5a94571710d87c0b (patch) | |
tree | 48d3440f765b56cf32a89b4b8193dd033d8227a8 /arch/mips/kernel/irq-mv6434x.c | |
parent | 31aa36658a123263a9a69896e348b9600e050679 (diff) |
[MIPS] Complete fixes after removal of pt_regs argument to int handlers.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/irq-mv6434x.c')
-rw-r--r-- | arch/mips/kernel/irq-mv6434x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index b117e64da64d..39c94fd8d8ba 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c | |||
@@ -113,7 +113,7 @@ static void end_mv64340_irq(unsigned int irq) | |||
113 | * Interrupt handler for interrupts coming from the Marvell chip. | 113 | * Interrupt handler for interrupts coming from the Marvell chip. |
114 | * It could be built in ethernet ports etc... | 114 | * It could be built in ethernet ports etc... |
115 | */ | 115 | */ |
116 | void ll_mv64340_irq(struct pt_regs *regs) | 116 | void ll_mv64340_irq(void) |
117 | { | 117 | { |
118 | unsigned int irq_src_low, irq_src_high; | 118 | unsigned int irq_src_low, irq_src_high; |
119 | unsigned int irq_mask_low, irq_mask_high; | 119 | unsigned int irq_mask_low, irq_mask_high; |
@@ -129,9 +129,9 @@ void ll_mv64340_irq(struct pt_regs *regs) | |||
129 | irq_src_high &= irq_mask_high; | 129 | irq_src_high &= irq_mask_high; |
130 | 130 | ||
131 | if (irq_src_low) | 131 | if (irq_src_low) |
132 | do_IRQ(ls1bit32(irq_src_low) + irq_base, regs); | 132 | do_IRQ(ls1bit32(irq_src_low) + irq_base); |
133 | else | 133 | else |
134 | do_IRQ(ls1bit32(irq_src_high) + irq_base + 32, regs); | 134 | do_IRQ(ls1bit32(irq_src_high) + irq_base + 32); |
135 | } | 135 | } |
136 | 136 | ||
137 | #define shutdown_mv64340_irq disable_mv64340_irq | 137 | #define shutdown_mv64340_irq disable_mv64340_irq |