From b66b89c5ce8d75367a14ac30dc4e4758f331b149 Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@hvrlab.org>
Date: Wed, 12 Apr 2006 09:03:08 +0200
Subject: [PATCH] --- yaml --- r: 27055 b: refs/heads/master c:
 343fdc39713d9c2fe836523e8f2dfc6a3ac39122 h: refs/heads/master i:   27053:
 451f3c9e359dd19ef9bb477b65065fc898103a54   27051:
 2b9429baaa2e19d8a97ffa6e3ce6a90dc75c5d23   27047:
 c1d03579da7961688cd8352203103bfe77c79652   27039:
 73aa7e05b9aa9e27fb2640dbf91364a76a2daf18 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mips/au1000/common/irq.c  | 1 +
 trunk/arch/mips/au1000/common/time.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f4016b653db7..961e35ab4468 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 477654fc5d5078d2213817609e68e8c968293261
+refs/heads/master: 343fdc39713d9c2fe836523e8f2dfc6a3ac39122
diff --git a/trunk/arch/mips/au1000/common/irq.c b/trunk/arch/mips/au1000/common/irq.c
index da61de776154..afe05ec12c27 100644
--- a/trunk/arch/mips/au1000/common/irq.c
+++ b/trunk/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/trunk/arch/mips/au1000/common/time.c b/trunk/arch/mips/au1000/common/time.c
index f85f1524b366..f74d66a58a21 100644
--- a/trunk/arch/mips/au1000/common/time.c
+++ b/trunk/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