[Xen-devel] [PATCH] x86-64: IOMMU compilation

[Jon Mason <jdmason@xxxxxxxxxx>]

This patch enables x86-64 Xen dom0 to compile if IOMMU is enabled in the kernel
config.  Warning, dom0 will crash during boot of the kernel if IOMMU is
enabled.  These changes do not affect non-IOMMU enabled kernels (a fact
I have verified myself).  I am currently working on debugging the IOMMU
dom0 crash.

Signed-off-by: Jon Mason <jdmason@xxxxxxxxxx>

--- linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile.orig        
2005-06-17 14:43:12.401177856 -0500
+++ linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile     2005-06-17 
14:43:35.504665592 -0500
@@ -34,9 +34,9 @@ c-obj-$(CONFIG_X86_IO_APIC)   += genapic.o
 #obj-$(CONFIG_SOFTWARE_SUSPEND)        += suspend_asm.o
 #obj-$(CONFIG_CPU_FREQ)                += cpufreq/
 #obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
-#obj-$(CONFIG_GART_IOMMU)      += pci-gart.o aperture.o
+c-obj-$(CONFIG_GART_IOMMU)     += pci-gart.o aperture.o
 c-obj-$(CONFIG_DUMMY_IOMMU)    += pci-nommu.o pci-dma.o
-#obj-$(CONFIG_SWIOTLB)         += swiotlb.o
+obj-$(CONFIG_SWIOTLB)          += swiotlb.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
 
 c-obj-$(CONFIG_MODULES)                += module.o
--- linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/e820.c.orig  2005-06-17 
14:43:46.259030680 -0500
+++ linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/e820.c       2005-06-17 
14:44:44.514174552 -0500
@@ -40,7 +40,6 @@ void __init add_memory_region(unsigned l
        e820.nr_map++;
 }
 
-#if 0
 extern char _end[];
 
 /* 
@@ -506,7 +505,6 @@ void __init setup_memory_region(void)
        printk(KERN_INFO "BIOS-provided physical RAM map:\n");
        e820_print_map(who);
 }
-#endif
 
 extern unsigned long xen_override_max_pfn;
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel