diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 08:29:27 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-11 11:07:24 -0500 |
| commit | e8156484ef1aa8b0ef2d928f7ee331041d404237 (patch) | |
| tree | b8ca29346502defcd02a40a938e99e9617005f28 /arch | |
| parent | cc120444f1039c0f566f7247fafa4fd597f0ecb3 (diff) | |
x86: 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 e88300d8e80a..01c76a0f2845 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -2555,7 +2555,8 @@ atomic_t irq_mis_count; 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; } |