diff options
| author | Herbert Valerio Riedel <hvr@hvrlab.org> | 2006-04-12 09:03:08 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-01 00:28:29 +0100 |
| commit | 343fdc39713d9c2fe836523e8f2dfc6a3ac39122 (patch) | |
| tree | fe27507b54f570753f9d78f2bd65c84c23042cfe | |
| parent | 477654fc5d5078d2213817609e68e8c968293261 (diff) | |
| download | op-kernel-dev-343fdc39713d9c2fe836523e8f2dfc6a3ac39122.zip op-kernel-dev-343fdc39713d9c2fe836523e8f2dfc6a3ac39122.tar.gz | |
[MIPS] AU1xxx mips_timer_interrupt() fixes
common/au1000/irq.c was missing a mips_timer_interrupt() prototype,
whereas in common/au1000/time.c the actual mips_timer_interrupt()
implementation was missing an irq_exit() invocation, causing a
preempt_count() leak.
Signed-off-by: Herbert Valerio Riedel <hvr@hvrlab.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/au1000/common/irq.c | 1 | ||||
| -rw-r--r-- | arch/mips/au1000/common/time.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index da61de7..afe05ec 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c @@ -68,6 +68,7 @@ extern void set_debug_traps(void); extern irq_cpustat_t irq_stat [NR_CPUS]; +extern void mips_timer_interrupt(struct pt_regs *regs); static void setup_local_irq(unsigned int irq, int type, int int_req); static unsigned int startup_irq(unsigned int irq); diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index f85f152..f74d66a 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c @@ -116,6 +116,7 @@ void mips_timer_interrupt(struct pt_regs *regs) null: ack_r4ktimer(0); + irq_exit(); } #ifdef CONFIG_PM |
