summaryrefslogtreecommitdiffstats
path: root/mm/gup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-06-22 10:57:28 +0200
committerIngo Molnar <mingo@kernel.org>2017-06-22 10:57:28 +0200
commita4eb8b993554d374002663200bf5721f7f2ee259 (patch)
treee8934fdf72b4b09db9f514ae82bc81d03959b942 /mm/gup.c
parent26179670a68b7b365fbfe38afb043dcd2e1a4678 (diff)
parent8d829b9bb878904f3419af8003176a12910b94e8 (diff)
downloadlinux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.gz
linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.bz2
linux-a4eb8b993554d374002663200bf5721f7f2ee259.zip
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/gup.c')
-rw-r--r--mm/gup.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/gup.c b/mm/gup.c
index 2050f9fe121d..3ab78dc3db7d 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -387,11 +387,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
/* mlock all present pages, but do not fault in new pages */
if ((*flags & (FOLL_POPULATE | FOLL_MLOCK)) == FOLL_MLOCK)
return -ENOENT;
- /* For mm_populate(), just skip the stack guard page. */
- if ((*flags & FOLL_POPULATE) &&
- (stack_guard_page_start(vma, address) ||
- stack_guard_page_end(vma, address + PAGE_SIZE)))
- return -ENOENT;
if (*flags & FOLL_WRITE)
fault_flags |= FAULT_FLAG_WRITE;
if (*flags & FOLL_REMOTE)