forked from rrcarlosr/Jetpack
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 1c8a28ab9943270e577d64b050c5155333ab3acb Mon Sep 17 00:00:00 2001
|
|
From: Ingo Molnar <mingo@elte.hu>
|
|
Date: Fri, 3 Jul 2009 08:29:27 -0500
|
|
Subject: [PATCH 062/352] x86/ioapic: Do not unmask io_apic when interrupt is
|
|
in progress
|
|
|
|
With threaded interrupts we might see an interrupt in progress on
|
|
migration. Do not unmask it when this is the case.
|
|
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/x86/kernel/apic/io_apic.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
|
|
index d34629d..1e1309d 100644
|
|
--- a/arch/x86/kernel/apic/io_apic.c
|
|
+++ b/arch/x86/kernel/apic/io_apic.c
|
|
@@ -1713,7 +1713,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
|
|
static inline bool ioapic_irqd_mask(struct irq_data *data)
|
|
{
|
|
/* If we are moving the irq we need to mask it */
|
|
- if (unlikely(irqd_is_setaffinity_pending(data))) {
|
|
+ if (unlikely(irqd_is_setaffinity_pending(data) &&
|
|
+ !irqd_irq_inprogress(data))) {
|
|
mask_ioapic_irq(data);
|
|
return true;
|
|
}
|
|
--
|
|
2.7.4
|
|
|