---

yaml --- r: 27055 b: refs/heads/master c: 343fdc3 h: refs/heads/master i: 27053: 451f3c9 27051: 2b9429b 27047: c1d0357 27039: 73aa7e0 v: v3
git-mirror · May 31, 2006 · b66b89c · b66b89c
1 parent 3a0704c
commit b66b89c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -116,6 +116,7 @@ void mips_timer_interrupt(struct pt_regs *regs)
 
 null:
 	ack_r4ktimer(0);
+	irq_exit();
 }
 
 #ifdef CONFIG_PM
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,7 @@ void mips_timer_interrupt(struct pt_regs *regs) @@
     null:
     	ack_r4ktimer(0);
+    	irq_exit();
     }
     #ifdef CONFIG_PM
@@ Expand Down @@