[folded-merged] mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2.patch removed from -mm tree

[folded-merged] mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2
has been removed from the -mm tree.  Its filename was
     mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2.patch

This patch was dropped because it was folded into mm-change-huge_ptep_clear_flush-to-return-the-original-pte.patch

------------------------------------------------------
From: Baolin Wang <baolin.wang@linux.alibaba.com>
Subject: mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2

fix build in several more architectures

Link: https://lkml.kernel.org/r/0009a4cd-2826-e8be-e671-f050d4f18d5d@linux.alibaba.com
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/ia64/include/asm/hugetlb.h   |    1 +
 arch/parisc/include/asm/hugetlb.h |    1 +
 arch/sh/include/asm/hugetlb.h     |    1 +
 3 files changed, 3 insertions(+)

--- a/arch/ia64/include/asm/hugetlb.h~mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2
+++ a/arch/ia64/include/asm/hugetlb.h
@@ -26,6 +26,7 @@ static inline int is_hugepage_only_range
 static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
 					  unsigned long addr, pte_t *ptep)
 {
+	return *ptep;
 }
 
 #include <asm-generic/hugetlb.h>
--- a/arch/parisc/include/asm/hugetlb.h~mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2
+++ a/arch/parisc/include/asm/hugetlb.h
@@ -31,6 +31,7 @@ static inline int prepare_hugepage_range
 static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
 					  unsigned long addr, pte_t *ptep)
 {
+	return *ptep;
 }
 
 #define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT
--- a/arch/sh/include/asm/hugetlb.h~mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2
+++ a/arch/sh/include/asm/hugetlb.h
@@ -24,6 +24,7 @@ static inline int prepare_hugepage_range
 static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
 					  unsigned long addr, pte_t *ptep)
 {
+	return *ptep;
 }
 
 static inline void arch_clear_hugepage_flags(struct page *page)
_

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-migration-v4.patch
mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-unmapping.patch