---

yaml --- r: 178898 b: refs/heads/master c: 7f41c2e h: refs/heads/master v: v3
git-mirror · Jan 6, 2010 · 56285bd · 56285bd
1 parent d7b81ff
commit 56285bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409d02ef6d74f5e91f5ea4c587b2ee1375f106fc
+refs/heads/master: 7f41c2e1523f628cc248e34192162aec5728bed7
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -2434,6 +2434,13 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
 		cfg = irq_cfg(irq);
 		raw_spin_lock(&desc->lock);
 
+		/*
+		 * Check if the irq migration is in progress. If so, we
+		 * haven't received the cleanup request yet for this irq.
+		 */
+		if (cfg->move_in_progress)
+			goto unlock;
+
 		if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))
 			goto unlock;