Skip to content

Commit 47a70be

Browse files
committed
iommu/amd: Remove stale amd_iommu_unmap_flush usage
Remove the new use of the variable introduced in the AMD driver branch. The variable was removed already in the iommu core branch, causing build errors when the brances are merged. Cc: Nadav Amit <[email protected]> Cc: Zhen Lei <[email protected]> Signed-off-by: Joerg Roedel <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1d65b90 commit 47a70be

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/iommu/amd/init.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,11 +1850,9 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
18501850
return ret;
18511851

18521852
if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) {
1853-
if (!amd_iommu_unmap_flush)
1854-
pr_info("IOMMU batching is disabled due to virtualization\n");
1855-
1853+
pr_info("Using strict mode due to virtualization\n");
1854+
iommu_set_dma_strict();
18561855
amd_iommu_np_cache = true;
1857-
amd_iommu_unmap_flush = true;
18581856
}
18591857

18601858
init_iommu_perf_ctr(iommu);

0 commit comments

Comments
 (0)