From 0dd035d5049b703ccdc45eb2cef801e5e653dc42 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 13 Feb 2007 13:26:25 +0100
Subject: [PATCH] --- yaml --- r: 48471 b: refs/heads/master c:
 2fb12a9bca5ad9aa6dcd2c639b4a7656a8843ef8 h: refs/heads/master i:   48469:
 0beabd032db4ddc29d67313db99f7025f4e59ca7   48467:
 ec9c1f31034c9068f4fc4c71231aadc78c58e658   48463:
 8c1848ab2acaae5a21652e50ba17125e3e187b76 v: v3

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

diff --git a/[refs] b/[refs]
index 8a41b21fb597..baf4f0613884 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcde1ebb81c51ebdfa02887703e4d21c1bbc2431
+refs/heads/master: 2fb12a9bca5ad9aa6dcd2c639b4a7656a8843ef8
diff --git a/trunk/arch/x86_64/kernel/irq.c b/trunk/arch/x86_64/kernel/irq.c
index 0c06af6c13bc..3bc30d2c13d3 100644
--- a/trunk/arch/x86_64/kernel/irq.c
+++ b/trunk/arch/x86_64/kernel/irq.c
@@ -18,6 +18,7 @@
 #include <asm/uaccess.h>
 #include <asm/io_apic.h>
 #include <asm/idle.h>
+#include <asm/smp.h>
 
 atomic_t irq_err_count;
 
@@ -120,9 +121,14 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
 
 	if (likely(irq < NR_IRQS))
 		generic_handle_irq(irq);
-	else if (printk_ratelimit())
-		printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n",
-			__func__, smp_processor_id(), vector);
+	else {
+		if (!disable_apic)
+			ack_APIC_irq();
+
+		if (printk_ratelimit())
+			printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n",
+				__func__, smp_processor_id(), vector);
+	}
 
 	irq_exit();