---

yaml --- r: 245665 b: refs/heads/master c: 983bbf1 h: refs/heads/master i: 245663: 7058de5 v: v3
git-mirror · May 19, 2011 · 5945322 · 5945322
1 parent 7d09308
commit 5945322
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b87ba87ca26e226b2277a2d5613ed596f408e96d
+refs/heads/master: 983bbf1af0664b78689612b247acb514300f62c7
diff --git a/trunk/arch/x86/kernel/irq.c b/trunk/arch/x86/kernel/irq.c
@@ -276,7 +276,8 @@ void fixup_irqs(void)
 		else if (!(warned++))
 			set_affinity = 0;
 
-		if (!irqd_can_move_in_process_context(data) && chip->irq_unmask)
+		if (!irqd_can_move_in_process_context(data) &&
+		    !irqd_irq_disabled(data) && chip->irq_unmask)
 			chip->irq_unmask(data);
 
 		raw_spin_unlock(&desc->lock);