[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    [MIPS] AU1xxx mips_timer_interrupt() fixes
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2006-05-31 23:59:50
Message-ID: 200605312359.k4VNxoU8023336 () hera ! kernel ! org
[Download RAW message or body]

commit 343fdc39713d9c2fe836523e8f2dfc6a3ac39122
tree fe27507b54f570753f9d78f2bd65c84c23042cfe
parent 477654fc5d5078d2213817609e68e8c968293261
author Herbert Valerio Riedel <hvr@hvrlab.org> Wed, 12 Apr 2006 09:03:08 +0200
committer Ralf Baechle <ralf@linux-mips.org> Thu, 01 Jun 2006 00:28:29 +0100

[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>

 arch/mips/au1000/common/irq.c  |    1 +
 arch/mips/au1000/common/time.c |    1 +
 2 files changed, 2 insertions(+)

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 @@ #define MIPS_TIMER_IP  7 /* IP 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 @@ #endif
 
 null:
 	ack_r4ktimer(0);
+	irq_exit();
 }
 
 #ifdef CONFIG_PM
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]