From 7f7f83ce8723b858e31a51860f838cb67cf0a52e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 Feb 2023 11:19:20 +0000 Subject: [PATCH] Revert "iommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map()" This reverts commit 8b47e324af717ea0dbde257b0a84042982746404 which is commit 3057fb9377eb5e73386dd0d8804bf72bdd23e391 upstream. It is needed to be reverted as a dependent change on it is being reverted to preserve the Android kernel abi. Bug: 161946584 Change-Id: Ida9dc39ce7faf2a33aae9bde9741fdf25e2f0303 Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index b79309928d78..5e269f3dca3d 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -3114,7 +3114,7 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, prot |= IOMMU_PROT_IW; mutex_lock(&domain->api_lock); - ret = iommu_map_page(domain, iova, paddr, page_size, prot, gfp); + ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL); mutex_unlock(&domain->api_lock); domain_flush_np_cache(domain, iova, page_size);