From 59453224ad527ab380be65426789c77312785fa5 Mon Sep 17 00:00:00 2001
From: "Tian, Kevin" <kevin.tian@intel.com>
Date: Fri, 6 May 2011 14:43:56 +0800
Subject: [PATCH] --- yaml --- r: 245665 b: refs/heads/master c:
 983bbf1af0664b78689612b247acb514300f62c7 h: refs/heads/master i:   245663:
 7058de51f0063879c5a5bc89f01c4389e182f11f v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/irq.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d4c0b3e73c8..f6f8c56a7da2 100644
--- 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
index 544efe2741be..6c0802eb2f7f 100644
--- 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);