Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f7f83ce authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "iommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map()" 



This reverts commit 8b47e324 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent bbf1c139

drivers/iommu/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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);