The patch titled Subject: mm-memory_failure-fix-the-missing-pte_unmap-call-fix has been added to the -mm tree. Its filename is mm-memory_failure-fix-the-missing-pte_unmap-call-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-memory_failure-fix-the-missing-pte_unmap-call-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-memory_failure-fix-the-missing-pte_unmap-call-fix.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-memory_failure-fix-the-missing-pte_unmap-call-fix cleanup Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx> Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> Cc: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory-failure.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/mm/memory-failure.c~mm-memory_failure-fix-the-missing-pte_unmap-call-fix +++ a/mm/memory-failure.c @@ -330,11 +330,8 @@ static unsigned long dev_pagemap_mapping if (pmd_devmap(*pmd)) return PMD_SHIFT; pte = pte_offset_map(pmd, address); - if (!pte_present(*pte)) - goto unmap; - if (pte_devmap(*pte)) + if (pte_present(*pte) && pte_devmap(*pte)) ret = PAGE_SHIFT; -unmap: pte_unmap(pte); return ret; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-memory_failure-fix-the-missing-pte_unmap-call-fix.patch mm.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch ipc-check-checkpoint_restore_ns_capable-to-modify-c-r-proc-files-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch