diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 08:29:27 -0500 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-08-17 08:58:44 +0200 |
| commit | 69cebd80ed4d0f0e1e67ddb7c73874358fbb0aa3 (patch) | |
| tree | f2ec5a8113640ee9b4ab8458d8a0ed758d745336 /arch | |
| parent | 570e2e0ec6be3ad1f99c19606b1fd67c68753823 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index f4dc2462a1ac..07c6aba75aa0 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1891,7 +1891,8 @@ static bool io_apic_level_ack_pending(struct irq_cfg *cfg) static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg) { /* 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(cfg); return true; } |