From 516696d4f5079bc33f50458fa97edf9e5b3e8604 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 5 Feb 2011 21:39:28 +0100 Subject: [PATCH] --- yaml --- r: 232931 b: refs/heads/master c: a9fe8d5fd52ecd17c3f3970bbcf6b3573f831898 h: refs/heads/master i: 232929: ff6b80c4409359c352eba52b34de62b5307dc674 232927: 4f917755e2b2a18f9ec2a70edb186fc62e9c0d39 v: v3 --- [refs] | 2 +- trunk/arch/m32r/kernel/irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 391434fd261f..bf78daff3408 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 872434d69c644b8aa5088b835598dc3cd9832aff +refs/heads/master: a9fe8d5fd52ecd17c3f3970bbcf6b3573f831898 diff --git a/trunk/arch/m32r/kernel/irq.c b/trunk/arch/m32r/kernel/irq.c index f745c1287f3a..76eaf3883fbd 100644 --- a/trunk/arch/m32r/kernel/irq.c +++ b/trunk/arch/m32r/kernel/irq.c @@ -80,7 +80,7 @@ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs) #ifdef CONFIG_DEBUG_STACKOVERFLOW /* FIXME M32R */ #endif - __do_IRQ(irq); + generic_handle_irq(irq); irq_exit(); set_irq_regs(old_regs);