1 files changed, 2 insertions, 15 deletions

diff --git a/mm/mlock.c b/mm/mlock.c
index c3924c7f00be..6b55e3efe0df 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -135,13 +135,6 @@ void munlock_vma_page(struct page *page)
         }
 }
 
-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
-{
-        return (vma->vm_flags & VM_GROWSDOWN) &&
-                (vma->vm_start == addr) &&
-                !vma_stack_continue(vma->vm_prev, addr);
-}
-
 /**
  * __mlock_vma_pages_range() -  mlock a range of pages in the vma.
  * @vma:   target vma
@@ -188,12 +181,6 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
         if (vma->vm_flags & VM_LOCKED)
                 gup_flags |= FOLL_MLOCK;
 
-        /* We don't try to access the guard page of a stack vma */
-        if (stack_guard_page(vma, start)) {
-                addr += PAGE_SIZE;
-                nr_pages--;
-        }
-
         return __get_user_pages(current, mm, addr, nr_pages, gup_flags,
                                 NULL, NULL, nonblocking);
 }
@@ -237,7 +224,7 @@ long mlock_vma_pages_range(struct vm_area_struct *vma,
 
         if (!((vma->vm_flags & (VM_DONTEXPAND | VM_RESERVED)) ||
                         is_vm_hugetlb_page(vma) ||
-                        vma == get_gate_vma(current))) {
+                        vma == get_gate_vma(current->mm))) {
 
                 __mlock_vma_pages_range(vma, start, end, NULL);
 
@@ -332,7 +319,7 @@ static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
         int lock = newflags & VM_LOCKED;
 
         if (newflags == vma->vm_flags || (vma->vm_flags & VM_SPECIAL) ||
-            is_vm_hugetlb_page(vma) || vma == get_gate_vma(current))
+            is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm))
                 goto out;       /* don't set VM_LOCKED,  don't count */
 
         pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);