---

yaml --- r: 232100 b: refs/heads/master c: c84077a h: refs/heads/master v: v3
git-mirror · Jan 21, 2011 · aab5f78 · aab5f78
1 parent 86b2736
commit aab5f78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51f3f15945aa2ccbc90baf17d912aed9981697b2
+refs/heads/master: c84077ac29978cbfb42dccbba3fee8523605e839
diff --git a/trunk/arch/cris/kernel/irq.c b/trunk/arch/cris/kernel/irq.c
@@ -93,8 +93,8 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
 		printk("do_IRQ: stack overflow: %lX\n", sp);
 		show_stack(NULL, (unsigned long *)sp);
 	}
-	__do_IRQ(irq);
-        irq_exit();
+	generic_handle_irq(irq);
+	irq_exit();
 	set_irq_regs(old_regs);
 }