Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / x86 / kernel / irq_32.c

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index cef054b09d27345c5f520ecb2a30eb87c3095b1c..00bda7bcda63741178db3ad46b444fe25c8b87a7 100644 (file)
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -79,7 +79,7 @@ unsigned int do_IRQ(struct pt_regs *regs)
 
        if (unlikely((unsigned)irq >= NR_IRQS)) {
                printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
-                                       __FUNCTION__, irq);
+                                       __func__, irq);
                BUG();
        }
 
@@ -134,7 +134,7 @@ unsigned int do_IRQ(struct pt_regs *regs)
                        : "=a" (arg1), "=d" (arg2), "=b" (bx)
                        :  "0" (irq),   "1" (desc),  "2" (isp),
                           "D" (desc->handle_irq)
-                       : "memory", "cc"
+                       : "memory", "cc", "ecx"
                );
        } else
 #endif