diff -urN linux-2.4.31-vanilla/arch/x86_64/kernel/io_apic.c linux-2.4.31/arch/x86_64/kernel/io_apic.c
--- linux-2.4.31-vanilla/arch/x86_64/kernel/io_apic.c	2005-04-03 18:42:19.000000000 -0700
+++ linux-2.4.31/arch/x86_64/kernel/io_apic.c	2005-06-10 03:12:22.000000000 -0700
@@ -222,7 +222,6 @@
 
 __setup("apic", ioapic_setup);
 
-#ifndef CONFIG_SMP
 #include <asm/pci-direct.h>
 #include <linux/pci_ids.h>
 #include <linux/pci.h>
@@ -279,7 +278,6 @@
 		}
 	}
 } 
-#endif
 
 static int __init ioapic_pirq_setup(char *str)
 {
diff -urN linux-2.4.31-vanilla/arch/x86_64/kernel/pci-gart.c linux-2.4.31/arch/x86_64/kernel/pci-gart.c
--- linux-2.4.31-vanilla/arch/x86_64/kernel/pci-gart.c	2005-05-31 17:56:56.000000000 -0700
+++ linux-2.4.31/arch/x86_64/kernel/pci-gart.c	2005-06-10 04:45:54.000000000 -0700
@@ -155,7 +155,12 @@
 	int i;
 	unsigned long iommu_page;
 
+#ifdef CONFIG_SWIOTLB
 	if (hwdev == NULL || hwdev->dma_mask < 0xffffffff || (no_iommu && !swiotlb))
+#else
+	if (hwdev == NULL || hwdev->dma_mask < 0xffffffff || (no_iommu))
+
+#endif
 		gfp |= GFP_DMA;
 
 	/* 
diff -urN linux-2.4.31-vanilla/arch/x86_64/kernel/setup.c linux-2.4.31/arch/x86_64/kernel/setup.c
--- linux-2.4.31-vanilla/arch/x86_64/kernel/setup.c	2005-04-03 18:42:19.000000000 -0700
+++ linux-2.4.31/arch/x86_64/kernel/setup.c	2005-06-10 04:57:36.000000000 -0700
@@ -51,8 +51,10 @@
 int acpi_disabled;
 EXPORT_SYMBOL(acpi_disabled);
 
+#ifdef CONFIG_SWIOTLB
 int swiotlb;
 EXPORT_SYMBOL(swiotlb);
+#endif
 
 extern	int phys_proc_id[NR_CPUS];
 
@@ -304,7 +306,7 @@
 #endif
 
 	paging_init();
-#if !defined(CONFIG_SMP) && defined(CONFIG_X86_IO_APIC)
+#if defined(CONFIG_X86_IO_APIC)
 	extern void check_ioapic(void);
 	check_ioapic();
 #endif