x86: GART: Convert gart_iommu_hole_init() to use iommu_init hook

[pandora-kernel.git] / arch / x86 / kernel / pci-dma.c

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index b2a71dc..ecde854 100644 (file)
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -216,7 +216,7 @@ static __init int iommu_setup(char *p)
                if (!strncmp(p, "allowdac", 8))
                        forbid_dac = 0;
                if (!strncmp(p, "nodac", 5))
-                       forbid_dac = -1;
+                       forbid_dac = 1;
                if (!strncmp(p, "usedac", 6)) {
                        forbid_dac = -1;
                        return 1;
@@ -292,24 +292,15 @@ static int __init pci_iommu_init(void)
        dma_debug_add_bus(&pci_bus_type);
 #endif
 
-       calgary_iommu_init();
+       x86_init.iommu.iommu_init();
 
        intel_iommu_init();
 
        amd_iommu_init();
 
-       gart_iommu_init();
-
        no_iommu_init();
        return 0;
 }
-
-void pci_iommu_shutdown(void)
-{
-       gart_iommu_shutdown();
-
-       amd_iommu_shutdown();
-}
 /* Must execute after PCI subsystem */
 rootfs_initcall(pci_iommu_init);