From 62410eeb40ef355fa47f63886542f4dacef13ba9 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Tue, 12 Jun 2012 16:42:43 +0200 Subject: 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 --- drivers/iommu/amd_iommu.c | 5 +++++ drivers/iommu/amd_iommu_init.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 0d0dc8598c72..584ea85ab2f0 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) 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/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index b82cf447724e..966d8ac9e147 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) 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; -- cgit v1.2.1