Skip to content

Commit

Permalink
iommu/amd: Remove stale amd_iommu_unmap_flush usage
Browse files Browse the repository at this point in the history
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 <namit@vmware.com>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20210802150643.3634-1-joro@8bytes.org
  • Loading branch information
Joerg Roedel committed Aug 2, 2021
1 parent 1d65b90 commit 47a70be
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/iommu/amd/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -1850,11 +1850,9 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
return ret;

if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) {
if (!amd_iommu_unmap_flush)
pr_info("IOMMU batching is disabled due to virtualization\n");

pr_info("Using strict mode due to virtualization\n");
iommu_set_dma_strict();
amd_iommu_np_cache = true;
amd_iommu_unmap_flush = true;
}

init_iommu_perf_ctr(iommu);
Expand Down

0 comments on commit 47a70be

Please sign in to comment.