From d9d595de724fe6d443eb2e349c9bb71fdeaf28ed Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Thu, 20 Nov 2008 14:09:33 -0700
Subject: [PATCH] --- yaml --- r: 119274 b: refs/heads/master c:
 0ca4b6b00113b064c080d26d803d0d7c80fb5dc8 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/io_apic.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13c785354e89..e7a07e133b7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23918b03060f6e572168fdde1798a905679d2e06
+refs/heads/master: 0ca4b6b00113b064c080d26d803d0d7c80fb5dc8
diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic.c
index 7a3f2028e2eb..c9513e1ff28d 100644
--- a/trunk/arch/x86/kernel/io_apic.c
+++ b/trunk/arch/x86/kernel/io_apic.c
@@ -1140,6 +1140,20 @@ static void __clear_irq_vector(int irq)
 
 	cfg->vector = 0;
 	cpus_clear(cfg->domain);
+
+	if (likely(!cfg->move_in_progress))
+		return;
+	cpus_and(mask, cfg->old_domain, cpu_online_map);
+	for_each_cpu_mask_nr(cpu, mask) {
+		for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS;
+								vector++) {
+			if (per_cpu(vector_irq, cpu)[vector] != irq)
+				continue;
+			per_cpu(vector_irq, cpu)[vector] = -1;
+			break;
+		}
+	}
+	cfg->move_in_progress = 0;
 }
 
 void __setup_vector_irq(int cpu)