The patch titled
Subject: powerpc-mm-iommu-allow-migration-of-cma-allocated-pages-during-mm_iommu_do_alloc-v8
has been removed from the -mm tree. Its filename was
powerpc-mm-iommu-allow-migration-of-cma-allocated-pages-during-mm_iommu_do_alloc-v8.patch
This patch was dropped because it was folded into powerpc-mm-iommu-allow-migration-of-cma-allocated-pages-during-mm_iommu_do_alloc.patch
------------------------------------------------------
From: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxx>
Subject: powerpc-mm-iommu-allow-migration-of-cma-allocated-pages-during-mm_iommu_do_alloc-v8
address review feedback, update changelog
Link: http://lkml.kernel.org/r/20190227144736.5872-4-aneesh.kumar@xxxxxxxxxxxxx
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx>
Reviewed-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Alexey Kardashevskiy <aik@xxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/mm/mmu_context_iommu.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/arch/powerpc/mm/mmu_context_iommu.c~powerpc-mm-iommu-allow-migration-of-cma-allocated-pages-during-mm_iommu_do_alloc-v8
+++ a/arch/powerpc/mm/mmu_context_iommu.c
@@ -96,7 +96,7 @@ static long mm_iommu_do_alloc(struct mm_
struct mm_iommu_table_group_mem_t **pmem)
{
struct mm_iommu_table_group_mem_t *mem;
- long i, ret = 0, locked_entries = 0;
+ long i, ret, locked_entries = 0;
unsigned int pageshift;
unsigned long flags;
unsigned long cur_ua;
@@ -161,8 +161,6 @@ static long mm_iommu_do_alloc(struct mm_
kfree(mem);
ret = -EFAULT;
goto unlock_exit;
- } else {
- ret = 0;
}
pageshift = PAGE_SHIFT;
@@ -195,6 +193,7 @@ static long mm_iommu_do_alloc(struct mm_
}
good_exit:
+ ret = 0;
atomic64_set(&mem->mapped, 1);
mem->used = 1;
mem->ua = ua;
_
Patches currently in -mm which might be from aneesh.kumar@xxxxxxxxxxxxx are
mm-update-ptep_modify_prot_start-commit-to-take-vm_area_struct-as-arg.patch
mm-update-ptep_modify_prot_commit-to-take-old-pte-value-as-arg.patch
arch-powerpc-mm-nest-mmu-workaround-for-mprotect-rw-upgrade.patch
mm-hugetlb-add-prot_modify_start-commit-sequence-for-hugetlb-update.patch
arch-powerpc-mm-hugetlb-nestmmu-workaround-for-hugetlb-mprotect-rw-upgrade.patch
mm-cma-add-pf-flag-to-force-non-cma-alloc.patch
mm-update-get_user_pages_longterm-to-migrate-pages-allocated-from-cma-region.patch
powerpc-mm-iommu-allow-migration-of-cma-allocated-pages-during-mm_iommu_do_alloc.patch
powerpc-mm-iommu-allow-large-iommu-page-size-only-for-hugetlb-backing.patch
