I get this: drivers/pci/xen-pcifront.c:259: error: redefinition of pci_frontend_enable_msix when I try and build. pci_frontend_enable_msix is declared as static inline in pci.h and is a real function in xen-pcifront.c. CONFIG_PCI_MSI=y CONFIG_XEN_PCIDEV_FRONTEND=m No check is being done for CONFIG_XEN_PCIDEV_FRONTEND_MODULE in pci.h. Either CONFIG_XEN_PCIDEV_FRONTEND should not be allowed to be a module, or CONFIG_XEN_PCIDEV_FRONTEND_MODULE needs to be checked for like: diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h index 6c022c8..7b99422 100644 --- a/arch/x86/include/asm/xen/pci.h +++ b/arch/x86/include/asm/xen/pci.h @@ -35,7 +35,9 @@ static inline int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) return -1; } #endif -#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN_PCIDEV_FRONTEND) + +#if defined(CONFIG_PCI_MSI) && (defined(CONFIG_XEN_PCIDEV_FRONTEND) \ + || defined(CONFIG_XEN_PCIDEV_FRONTEND_MODULE)) /* Defined in drivers/pci/xen-pcifront.c */ int pci_frontend_enable_msi(struct pci_dev *dev, int **vectors); void pci_frontend_disable_msi(struct pci_dev *dev); linewrapping probably destroyed the patch but it should be obvious what is wrong. Thanks James _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
> Either CONFIG_XEN_PCIDEV_FRONTEND should not be allowed to be amodule,> or CONFIG_XEN_PCIDEV_FRONTEND_MODULE needs to be checked for like: > > diff --git a/arch/x86/include/asm/xen/pci.h > b/arch/x86/include/asm/xen/pci.h > index 6c022c8..7b99422 100644 > --- a/arch/x86/include/asm/xen/pci.h > +++ b/arch/x86/include/asm/xen/pci.h > @@ -35,7 +35,9 @@ static inline int xen_setup_msi_irqs(struct pci_dev > *dev, int nvec, int type) > return -1; > } > #endif > -#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN_PCIDEV_FRONTEND) > + > +#if defined(CONFIG_PCI_MSI) && (defined(CONFIG_XEN_PCIDEV_FRONTEND) \ > + || defined(CONFIG_XEN_PCIDEV_FRONTEND_MODULE)) > /* Defined in drivers/pci/xen-pcifront.c */ > int pci_frontend_enable_msi(struct pci_dev *dev, int **vectors); > void pci_frontend_disable_msi(struct pci_dev *dev); > > linewrapping probably destroyed the patch but it should be obviouswhat> is wrong. >That''s still not enough though - I get a link failure after that. James _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Konrad Rzeszutek Wilk
2009-Nov-16 14:39 UTC
Re: [Xen-devel] compile error with pvops and pcifront
On Sun, Nov 15, 2009 at 04:24:02PM +1100, James Harper wrote:> > Either CONFIG_XEN_PCIDEV_FRONTEND should not be allowed to be a > module, > > or CONFIG_XEN_PCIDEV_FRONTEND_MODULE needs to be checked for like: > > > > diff --git a/arch/x86/include/asm/xen/pci.h > > b/arch/x86/include/asm/xen/pci.h > > index 6c022c8..7b99422 100644 > > --- a/arch/x86/include/asm/xen/pci.h > > +++ b/arch/x86/include/asm/xen/pci.h > > @@ -35,7 +35,9 @@ static inline int xen_setup_msi_irqs(struct pci_dev > > *dev, int nvec, int type) > > return -1; > > } > > #endif > > -#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN_PCIDEV_FRONTEND) > > + > > +#if defined(CONFIG_PCI_MSI) && (defined(CONFIG_XEN_PCIDEV_FRONTEND) \ > > + || defined(CONFIG_XEN_PCIDEV_FRONTEND_MODULE)) > > /* Defined in drivers/pci/xen-pcifront.c */ > > int pci_frontend_enable_msi(struct pci_dev *dev, int **vectors); > > void pci_frontend_disable_msi(struct pci_dev *dev); > > > > linewrapping probably destroyed the patch but it should be obvious > what > > is wrong. > > > > That''s still not enough though - I get a link failure after that.Can you e-mail me your whole .config file, please? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel