Re: [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

On Wed, Mar 10, 2010 at 07:42:35PM +0100, Sander Eikelenboom wrote:
> 
> 
> Hi All,
> 
> xen stable-2.6.31/master doesn't seem to compile:

This should fix it:


diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index 5e94f3c..5a7c7e8 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -1,24 +1,13 @@
 #ifndef _ASM_X86_XEN_PCI_H
 #define _ASM_X86_XEN_PCI_H
 
-#ifdef CONFIG_XEN_DOM0_PCI
-int xen_register_gsi(u32 gsi, int triggering, int polarity);
+#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN)
 int xen_create_msi_irq(struct pci_dev *dev,
 			struct msi_desc *msidesc,
 			int type, int pirq_override);
 int xen_destroy_irq(int irq);
-void xen_teardown_msi_dev(struct pci_dev *dev);
-
-int xen_find_device_domain_owner(struct pci_dev *dev);
-int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
-int xen_unregister_device_domain_owner(struct pci_dev *dev);
 
 #else
-static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
-{
-	return -1;
-}
-
 static inline int xen_create_msi_irq(struct pci_dev *dev,
 				struct msi_desc *msidesc,
 				int type, int pirq_override)
@@ -29,6 +18,21 @@ static inline int xen_destroy_irq(int irq)
 {
 	return -1;
 }
+#endif
+#ifdef CONFIG_XEN_DOM0_PCI
+int xen_register_gsi(u32 gsi, int triggering, int polarity);
+void xen_teardown_msi_dev(struct pci_dev *dev);
+
+int xen_find_device_domain_owner(struct pci_dev *dev);
+int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
+int xen_unregister_device_domain_owner(struct pci_dev *dev);
+
+#else
+static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
+{
+	return -1;
+}
+
 static inline int xen_find_device_domain_owner(struct pci_dev *dev)
 {
 	return -1;