aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-06-12 10:42:43 -0400
committerJoerg Roedel <joerg.roedel@amd.com>2012-07-17 06:17:07 -0400
commit62410eeb40ef355fa47f63886542f4dacef13ba9 (patch)
treef1910faf68afdb3f0d5c621d8f8ebe5f2d69b320
parent11ee5ac47b78d7e117c84147596a124ce6421a3a (diff)
iommu/amd: Move unmap_flush message to amd_iommu_init_dma_ops()
The message belongs there anyway, so move it to that function. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r--drivers/iommu/amd_iommu.c5
-rw-r--r--drivers/iommu/amd_iommu_init.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 0d0dc8598c7..584ea85ab2f 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2971,6 +2971,11 @@ int __init amd_iommu_init_dma_ops(void)
2971 2971
2972 amd_iommu_stats_init(); 2972 amd_iommu_stats_init();
2973 2973
2974 if (amd_iommu_unmap_flush)
2975 pr_info("AMD-Vi: IO/TLB flush on unmap enabled\n");
2976 else
2977 pr_info("AMD-Vi: Lazy IO/TLB flushing enabled\n");
2978
2974 return 0; 2979 return 0;
2975 2980
2976free_domains: 2981free_domains:
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index b82cf447724..966d8ac9e14 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1702,14 +1702,6 @@ static int __init amd_iommu_init(void)
1702 1702
1703 x86_platform.iommu_shutdown = disable_iommus; 1703 x86_platform.iommu_shutdown = disable_iommus;
1704 1704
1705 if (iommu_pass_through)
1706 goto out;
1707
1708 if (amd_iommu_unmap_flush)
1709 printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n");
1710 else
1711 printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");
1712
1713out: 1705out:
1714 return ret; 1706 return ret;
1715 1707