diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 544efe2741be49c92fb9bdfe98df2c0671c4dbdf..6c0802eb2f7f7efdc79c9a51d160ac92c70e43c2 100644
--- a/arch/x86/kernel/irq.c
+++ b/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);