The patch titled
Subject: mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix
has been removed from the -mm tree. Its filename was
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch
This patch was dropped because it was folded into mm-change-return-type-int-to-vm_fault_t-for-fault-handlers.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix
don't shadow outer local `ret' in __do_huge_pmd_anonymous_page()
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Souptick Joarder <jrdr.linux@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/mm/huge_memory.c~mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix
+++ a/mm/huge_memory.c
@@ -584,15 +584,15 @@ static vm_fault_t __do_huge_pmd_anonymou
/* Deliver the page fault to userland */
if (userfaultfd_missing(vma)) {
- vm_fault_t ret;
+ vm_fault_t ret2;
spin_unlock(vmf->ptl);
mem_cgroup_cancel_charge(page, memcg, true);
put_page(page);
pte_free(vma->vm_mm, pgtable);
- ret = handle_userfault(vmf, VM_UFFD_MISSING);
- VM_BUG_ON(ret & VM_FAULT_FALLBACK);
- return ret;
+ ret2 = handle_userfault(vmf, VM_UFFD_MISSING);
+ VM_BUG_ON(ret2 & VM_FAULT_FALLBACK);
+ return ret2;
}
entry = mk_huge_pmd(page, vma->vm_page_prot);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers.patch
