diff options
| author | Jan Beulich <jbeulich@suse.com> | 2011-09-22 18:31:02 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2011-09-22 18:31:02 +0100 |
| commit | 1f6bf99c22ce2e13d09e24431688679a96be36a0 (patch) | |
| tree | f9690a0d348fc1a0c90e77c284259391080e06c5 /xen/arch/x86/irq.c | |
| parent | e463d3619896fc257906d08d0a2b40474ea19e80 (diff) | |
| download | xen-1f6bf99c22ce2e13d09e24431688679a96be36a0.tar.gz xen-1f6bf99c22ce2e13d09e24431688679a96be36a0.tar.bz2 xen-1f6bf99c22ce2e13d09e24431688679a96be36a0.zip | |
x86: IO-APIC code has no dependency on PCI
The IRQ handling code requires pcidevs_lock to be held only for MSI
interrupts.
As the handling of which was now fully moved into msi.c (i.e. while
applying fine without, the patch needs to be applied after the one
titled "x86: split MSI IRQ chip"), io_apic.c now also doesn't need to
include PCI headers anymore.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'xen/arch/x86/irq.c')
| -rw-r--r-- | xen/arch/x86/irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 9606ae2c1e..e0b2d01379 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1662,10 +1662,7 @@ int map_domain_pirq( struct pirq *info; struct irq_desc *desc; unsigned long flags; - struct msi_desc *msi_desc; - struct pci_dev *pdev = NULL; - ASSERT(spin_is_locked(&pcidevs_lock)); ASSERT(spin_is_locked(&d->event_lock)); if ( !IS_PRIV(current->domain) && @@ -1708,6 +1705,10 @@ int map_domain_pirq( if ( type == MAP_PIRQ_TYPE_MSI ) { struct msi_info *msi = (struct msi_info *)data; + struct msi_desc *msi_desc; + struct pci_dev *pdev; + + ASSERT(spin_is_locked(&pcidevs_lock)); ret = -ENODEV; if ( !cpu_has_apic ) |