diff options
| -rw-r--r-- | xen/arch/x86/irq.c | 2 | ||||
| -rw-r--r-- | xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h | 1 | ||||
| -rw-r--r-- | xen/include/asm-ia64/linux-xen/asm/pci.h | 8 | ||||
| -rw-r--r-- | xen/include/asm-x86/pci.h | 8 | ||||
| -rw-r--r-- | xen/include/xen/pci.h | 5 |
5 files changed, 17 insertions, 7 deletions
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e75c06a3b6..bfdfa2638e 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1877,7 +1877,7 @@ int map_domain_pirq( if ( opt_irq_vector_map == OPT_IRQ_VECTOR_MAP_PERDEV && !desc->arch.used_vectors ) { - desc->arch.used_vectors = &pdev->info.used_vectors; + desc->arch.used_vectors = &pdev->arch.used_vectors; if ( desc->arch.vector != IRQ_VECTOR_UNASSIGNED ) { int vector = desc->arch.vector; diff --git a/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h b/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h deleted file mode 100644 index 29f4f4cd69..0000000000 --- a/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h +++ /dev/null @@ -1 +0,0 @@ -/* This file is intentionally left empty. */ diff --git a/xen/include/asm-ia64/linux-xen/asm/pci.h b/xen/include/asm-ia64/linux-xen/asm/pci.h index 10f9c41e7b..95ffd407c8 100644 --- a/xen/include/asm-ia64/linux-xen/asm/pci.h +++ b/xen/include/asm-ia64/linux-xen/asm/pci.h @@ -28,6 +28,10 @@ void pcibios_config_init(void); struct pci_dev; +#ifdef XEN +struct arch_pci_dev {}; +#endif + /* * PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct correspondence * between device bus addresses and CPU physical addresses. Platforms with a hardware I/O @@ -43,6 +47,7 @@ struct pci_dev; extern unsigned long ia64_max_iommu_merge_mask; #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL) +#ifndef XEN static inline void pcibios_set_master (struct pci_dev *dev) { @@ -110,7 +115,6 @@ extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma, #define HAVE_PCI_LEGACY extern int pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma); -#ifndef XEN extern ssize_t pci_read_legacy_io(struct kobject *kobj, char *buf, loff_t off, size_t count); extern ssize_t pci_write_legacy_io(struct kobject *kobj, char *buf, loff_t off, @@ -144,6 +148,7 @@ struct pci_controller { #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata) #define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment) +#ifndef XEN extern struct pci_ops pci_root_ops; static inline int pci_proc_domain(struct pci_bus *bus) @@ -161,7 +166,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, struct pci_bus_region *region); -#ifndef XEN static inline struct resource * pcibios_select_root(struct pci_dev *pdev, struct resource *res) { diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h new file mode 100644 index 0000000000..7bcb7027d0 --- /dev/null +++ b/xen/include/asm-x86/pci.h @@ -0,0 +1,8 @@ +#ifndef __X86_PCI_H__ +#define __X86_PCI_H__ + +struct arch_pci_dev { + vmask_t used_vectors; +}; + +#endif /* __X86_PCI_H__ */ diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index b57bb90f96..0e0d1042e1 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -12,6 +12,7 @@ #include <xen/list.h> #include <xen/spinlock.h> #include <xen/irq.h> +#include <asm/pci.h> /* * The PCI interface treats multi-function devices as independent @@ -39,9 +40,6 @@ struct pci_dev_info { u8 bus; u8 devfn; } physfn; -#ifdef CONFIG_X86 - vmask_t used_vectors; -#endif }; struct pci_dev { @@ -62,6 +60,7 @@ struct pci_dev { const u8 bus; const u8 devfn; struct pci_dev_info info; + struct arch_pci_dev arch; u64 vf_rlen[6]; }; |