The patch titled Subject: mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when migration has been added to the -mm mm-unstable branch. Its filename is mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-v4.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-v4.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxx Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> Reviewed-by: Muchun Song <songmuchun@xxxxxxxxxxxxx> Reviewed-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx> Acked-by: David Hildenbrand <david@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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@xxxxxxxxxxxxxxxxx are mm-change-huge_ptep_clear_flush-to-return-the-original-pte.patch mm-change-huge_ptep_clear_flush-to-return-the-original-pte-fix-2.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