[PATCH] ia64 kernel fails to link because of PCI MSI quirk

[PATCH] ia64 kernel fails to link because of PCI MSI quirk

[James Bottomley]

The problem is that the MSI code has an unconditional dependency on
pci_msi_quirk.  However, the quirk and the variable are only defined if
CONFIG_X86_IO_APIC is defined, which it never is on ia64.

The solution is to make the variable global and unconditional.

James

===== drivers/pci/quirks.c 1.72 vs edited =====
--- 1.72/drivers/pci/quirks.c	2005-03-10 02:38:25 -06:00
+++ edited/drivers/pci/quirks.c	2005-03-15 10:25:43 -06:00
@@ -19,6 +19,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
+int pci_msi_quirk = 0;
+
 #undef DEBUG
 
 /* Deal with broken BIOS'es that neglect to enable passive release,
@@ -428,8 +430,6 @@
 		sis_apic_bug = 1;
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI,	PCI_ANY_ID,
quirk_ioapic_rmw );
-
-int pci_msi_quirk;
 
 #define AMD8131_revA0        0x01
 #define AMD8131_revB0        0x11

Re: [PATCH] ia64 kernel fails to link because of PCI MSI quirk

[Andrew Morton]

James Bottomley <James.Bottomley@SteelEye.com> wrote:
>
> The problem is that the MSI code has an unconditional dependency on
>  pci_msi_quirk.  However, the quirk and the variable are only defined if
>  CONFIG_X86_IO_APIC is defined, which it never is on ia64.

Yes, I hit that as well.

>  The solution is to make the variable global and unconditional.

I fixed it differently:

--- 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;
 
_