iommu/amd: Move unmap_flush message to amd_iommu_init_dma_ops()
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 12 Jun 2012 14:42:43 +0000 (16:42 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 17 Jul 2012 10:17:07 +0000 (12:17 +0200)
The message belongs there anyway, so move it to that
function.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_init.c

index 0d0dc8598c72302765f320d43faaac807f1e13e4..584ea85ab2f06aaf421fe840ae3c5a97932f3a58 100644 (file)
@@ -2971,6 +2971,11 @@ int __init amd_iommu_init_dma_ops(void)
 
        amd_iommu_stats_init();
 
+       if (amd_iommu_unmap_flush)
+               pr_info("AMD-Vi: IO/TLB flush on unmap enabled\n");
+       else
+               pr_info("AMD-Vi: Lazy IO/TLB flushing enabled\n");
+
        return 0;
 
 free_domains:
index b82cf447724e7005ec97182b166ba8712a526114..966d8ac9e1473fa50507bb3b9a02f887119bab2d 100644 (file)
@@ -1702,14 +1702,6 @@ static int __init amd_iommu_init(void)
 
        x86_platform.iommu_shutdown = disable_iommus;
 
-       if (iommu_pass_through)
-               goto out;
-
-       if (amd_iommu_unmap_flush)
-               printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n");
-       else
-               printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");
-
 out:
        return ret;