msi build error on ia64

From: Andrew Morton <akpm_at_osdl.org>
Date: 2005-03-12 21:25:01
Doing a `make allmodconfig' with Linus's latest tree:

drivers/built-in.o(.text+0x10302): In function `msi_init':
drivers/pci/msi.c:373: undefined reference to `pci_msi_quirk'
drivers/built-in.o(.text+0x10320):drivers/pci/msi.c:373: undefined reference to `pci_msi_quirk'

This is because drivers/pci/quirks.c:pci_msi_quirk is only defined if
CONFIG_X86_IO_APIC, but msi_init() unconditionally uses it.

Is this fix appropriate?


--- 25/drivers/pci/pci.h~ia64-msi-build-fix	Sat Mar 12 18:13:37 2005
+++ 25-akpm/drivers/pci/pci.h	Sat Mar 12 18:14:23 2005
@@ -64,8 +64,13 @@ extern void pci_remove_legacy_files(stru
 /* Lock for read/write access to pci device and bus lists */
 extern spinlock_t pci_bus_lock;
 
-extern int pcie_mch_quirk;
+#ifdef CONFIG_X86_IO_APIC
 extern int pci_msi_quirk;
+#else
+#define pci_msi_quirk 0
+#endif
+
+extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
 extern struct class_device_attribute class_device_attr_cpuaffinity;
 
_


-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Sat Mar 12 05:25:59 2005

This archive was generated by hypermail 2.1.8 : 2005-08-02 09:20:36 EST