From 2f573c4b5bf61b00514488a3f792aaf50906659a Mon Sep 17 00:00:00 2001 From: Liam Mark Date: Tue, 10 Mar 2020 09:35:59 -0700 Subject: [PATCH] ANDROID: iommu/iova: Fix to use __alloc_and_insert_iova_best_fit Looks like there was a merge issue when pulling the following upstream change: https://lore.kernel.org/lkml/7239ddd532e94a4371289f3be23c66a3@codeaurora.org/ Fix so that it correctly calls __alloc_and_insert_iova_best_fit when best_fit is set. Bug: 149544392 Change-Id: I6b9992dedf4991dee088e77767e0dc077758b581 Signed-off-by: Liam Mark --- drivers/iommu/iova.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index 9c82d4eeebe7..4eec92be81fe 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -386,7 +386,7 @@ alloc_iova(struct iova_domain *iovad, unsigned long size, return NULL; if (iovad->best_fit) { - ret = __alloc_and_insert_iova_range(iovad, size, + ret = __alloc_and_insert_iova_best_fit(iovad, size, limit_pfn + 1, new_iova, size_aligned); } else { ret = __alloc_and_insert_iova_range(iovad, size, limit_pfn + 1,