[folded-merged] mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-v4.patch removed from -mm tree

[folded-merged] mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-v4.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when migration
has been removed from the -mm tree.  Its filename was
     mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-v4.patch

This patch was dropped because it was folded into mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration.patch

------------------------------------------------------
From: Baolin Wang <baolin.wang@linux.alibaba.com>
Subject: mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when migration

fix build errors for !CONFIG_MMU

Link: https://lkml.kernel.org/r/a4baca670aca637e7198d9ae4543b8873cb224dc.1652270205.git.baolin.wang@linux.alibaba.com
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/hugetlb.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/include/linux/hugetlb.h~mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-v4
+++ a/include/linux/hugetlb.h
@@ -1094,18 +1094,16 @@ static inline void set_huge_swap_pte_at(
 {
 }
 
-#ifdef CONFIG_MMU
 static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
 					  unsigned long addr, pte_t *ptep)
 {
-	return ptep_get(ptep);
+	return *ptep;
 }
 
 static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
 				   pte_t *ptep, pte_t pte)
 {
 }
-#endif
 #endif	/* CONFIG_HUGETLB_PAGE */
 
 static inline spinlock_t *huge_pte_lock(struct hstate *h,
_

Patches currently in -mm which might be from baolin.wang@linux.alibaba.com are

mm-change-huge_ptep_clear_flush-to-return-the-original-pte.patch
mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration.patch
mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-unmapping.patch