diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2015-11-20 11:25:04 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2015-11-26 18:05:01 +0000 |
| commit | b4ff8389ed14b849354b59ce9b360bdefcdbf99c (patch) | |
| tree | 8681308ba00216a51ec518fe6966d1a789ba9d44 /drivers | |
| parent | 9c17d96500f78d7ecdb71ca6942830158bc75a2b (diff) | |
| download | op-kernel-dev-b4ff8389ed14b849354b59ce9b360bdefcdbf99c.zip op-kernel-dev-b4ff8389ed14b849354b59ce9b360bdefcdbf99c.tar.gz | |
xen/events: Always allocate legacy interrupts on PV guests
After commit 8c058b0b9c34 ("x86/irq: Probe for PIC presence before
allocating descs for legacy IRQs") early_irq_init() will no longer
preallocate descriptors for legacy interrupts if PIC does not
exist, which is the case for Xen PV guests.
Therefore we may need to allocate those descriptors ourselves.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/events/events_base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 849500e..524c221 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -39,6 +39,7 @@ #include <asm/irq.h> #include <asm/idle.h> #include <asm/io_apic.h> +#include <asm/i8259.h> #include <asm/xen/pci.h> #endif #include <asm/sync_bitops.h> @@ -420,7 +421,7 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi) return xen_allocate_irq_dynamic(); /* Legacy IRQ descriptors are already allocated by the arch. */ - if (gsi < NR_IRQS_LEGACY) + if (gsi < nr_legacy_irqs()) irq = gsi; else irq = irq_alloc_desc_at(gsi, -1); @@ -446,7 +447,7 @@ static void xen_free_irq(unsigned irq) kfree(info); /* Legacy IRQ descriptors are managed by the arch. */ - if (irq < NR_IRQS_LEGACY) + if (irq < nr_legacy_irqs()) return; irq_free_desc(irq); |
