diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
| commit | a4eb8b993554d374002663200bf5721f7f2ee259 (patch) | |
| tree | e8934fdf72b4b09db9f514ae82bc81d03959b942 /mm/gup.c | |
| parent | x86/boot/64: Put __startup_64() into .head.text (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-dev-a4eb8b993554d374002663200bf5721f7f2ee259.tar.xz linux-dev-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.c | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -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) |