---

yaml --- r: 316574 b: refs/heads/master c: 62410ee h: refs/heads/master v: v3
git-mirror · Jul 17, 2012 · a4cd34c · a4cd34c
1 parent e8b0af3
commit a4cd34c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ee5ac47b78d7e117c84147596a124ce6421a3a
+refs/heads/master: 62410eeb40ef355fa47f63886542f4dacef13ba9
diff --git a/trunk/drivers/iommu/amd_iommu.c b/trunk/drivers/iommu/amd_iommu.c
@@ -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:

diff --git a/trunk/drivers/iommu/amd_iommu_init.c b/trunk/drivers/iommu/amd_iommu_init.c
@@ -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;