[PATCH] 2.6.5-bk1 on x86-64 linkage error

[Mikael Pettersson]

Andi,

2.6.5-bk1 on x86-64 with CONFIG_GART_IOMMU=n fails to
link due to undefined references to iommu_aperture_allowed
and iommu_aperture_disabled. Fixed by the patch below.

/Mikael

--- linux-2.6.5-bk1/arch/x86_64/kernel/io_apic.c.~1~	2004-04-13 21:18:26.000000000 +0200
+++ linux-2.6.5-bk1/arch/x86_64/kernel/io_apic.c	2004-04-13 23:01:32.000000000 +0200
@@ -250,12 +250,14 @@
 				vendor &= 0xffff;
 				switch (vendor) { 
 				case PCI_VENDOR_ID_VIA:
+#ifdef CONFIG_GART_IOMMU
 					if (end_pfn >= (0xffffffff>>PAGE_SHIFT) &&
 					    !iommu_aperture_allowed) {
 						printk(KERN_INFO
     "Looks like a VIA chipset. Disabling IOMMU. Overwrite with \"iommu=allowed\"\n");
 						iommu_aperture_disabled = 1;
 					}
+#endif
 					/* FALL THROUGH */
 				case PCI_VENDOR_ID_NVIDIA:
 #ifndef CONFIG_SMP
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/