commit a184e032784a330bf6dc5cc7546be6f31da1eabd Author: Konrad Rzeszutek Wilk Date: Tue Mar 16 12:37:26 2010 -0400 xen: Fix the co-dependency of PCI frontend driver and various CONFIG options. We have a big turn knob called CONFIG_PCI_XEN_PASSTHROUGH that selects two pieces of logic: XEN_SWIOTLB and XEN_PCI. The PCI frontend depends on that but did not have the right depend in its Kconfig. Also fixed the header file since there are a mulitple of declerations that are from different files: arch/x86/xen/pci.c, arch/x86/pci/xen.c and drivers/xen/events.c. diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h index d68637f..abea466 100644 --- a/arch/x86/include/asm/xen/pci.h +++ b/arch/x86/include/asm/xen/pci.h @@ -1,11 +1,9 @@ #ifndef _ASM_X86_XEN_PCI_H #define _ASM_X86_XEN_PCI_H +/* in arch/x86/pci/xen.c */ #if defined(CONFIG_PCI_MSI) #if defined(CONFIG_PCI_XEN) -int xen_create_msi_irq(struct pci_dev *dev, - struct msi_desc *msidesc, - int type); void xen_pci_teardown_msi_dev(struct pci_dev *dev); void xen_pci_teardown_msi_irq(int irq); int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type); @@ -47,12 +45,6 @@ static inline void xen_pci_frontend_disable_msix(struct pci_dev *dev) xen_pci_frontend->disable_msix(dev); } #else -static inline int xen_create_msi_irq(struct pci_dev *dev, - struct msi_desc *msidesc, - int type) -{ - return -1; -} static inline void xen_pci_teardown_msi_dev(struct pci_dev *dev) { } static inline void xen_pci_teardown_msi_irq(int irq) { } static inline int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) @@ -60,9 +52,23 @@ static inline int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type return -ENODEV; } #endif /* CONFIG_PCI_XEN */ - #endif /* CONFIG_PCI_MSI */ +/* in drivers/xen/events.c */ +#ifdef CONFIG_PCI_MSI +int xen_create_msi_irq(struct pci_dev *dev, + struct msi_desc *msidesc, + int type); +#else +static inline int xen_create_msi_irq(struct pci_dev *dev, + struct msi_desc *msidesc, + int type) +{ + return -1; +} +#endif + +/* in arch/x86/xen/pci.c */ #ifdef CONFIG_XEN_DOM0_PCI int xen_register_gsi(u32 gsi, int triggering, int polarity); int xen_find_device_domain_owner(struct pci_dev *dev); diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 7802fcd..0dd2187 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -53,7 +53,7 @@ config PCI_STUB config XEN_PCIDEV_FRONTEND tristate "Xen PCI Frontend" - depends on XEN && PCI && X86 + depends on XEN && PCI && X86 && XEN_PCI_PASSTHROUGH select HOTPLUG select XEN_XENBUS_FRONTEND default y