From aab5f789aa2dd80c494c78b27ba2dcc25c91e578 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 19 Jan 2011 13:59:01 +0100
Subject: [PATCH] --- yaml --- r: 232100 b: refs/heads/master c:
 c84077ac29978cbfb42dccbba3fee8523605e839 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/cris/kernel/irq.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 923bc5fc828e..e8c6b5b9c7b8 100644
--- 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
index 469f7f9d62e0..b6117b464bed 100644
--- 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);
 }