diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2018-08-22 07:05:05 +0000 |
|---|---|---|
| committer | Johannes Weiner <hannes@cmpxchg.org> | 2018-08-22 07:05:05 +0000 |
| commit | 8af52ef9a802d538461f02c0e23cd7b61c1bc12d (patch) | |
| tree | d18248b470e16047d7bafe156bb59016706f2282 | |
| parent | 56df22f10ce166005bb82554d3dbcdc05a235a0a (diff) | |
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@infradead.org>
Cc: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | mm/huge_memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 12300de4c088..9f3e8b5cdf7d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -584,15 +584,15 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, /* 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); |