diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 16:46:04 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 16:46:04 +0100 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /arch/mips/mips-boards/sim/sim_int.c | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
| download | blackbird-op-linux-513b046c96cc2fbce730a3474f6f7ff0c4fdd05c.tar.gz blackbird-op-linux-513b046c96cc2fbce730a3474f6f7ff0c4fdd05c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/mips-boards/sim/sim_int.c')
| -rw-r--r-- | arch/mips/mips-boards/sim/sim_int.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/mips/mips-boards/sim/sim_int.c b/arch/mips/mips-boards/sim/sim_int.c index 2c15c8efec4e..2ce449dce6f2 100644 --- a/arch/mips/mips-boards/sim/sim_int.c +++ b/arch/mips/mips-boards/sim/sim_int.c @@ -71,12 +71,7 @@ static inline unsigned int irq_ffs(unsigned int pending) #endif } -static inline void sim_hw0_irqdispatch(struct pt_regs *regs) -{ - do_IRQ(2, regs); -} - -asmlinkage void plat_irq_dispatch(struct pt_regs *regs) +asmlinkage void plat_irq_dispatch(void) { unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM; int irq; @@ -84,9 +79,9 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs) irq = irq_ffs(pending); if (irq > 0) - do_IRQ(MIPSCPU_INT_BASE + irq, regs); + do_IRQ(MIPSCPU_INT_BASE + irq); else - spurious_interrupt(regs); + spurious_interrupt(); } void __init arch_init_irq(void) |
