diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:31 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:31 +0800 |
| commit | 78278fb152735c686cb13e1ae3bcee78fc2cd154 (patch) | |
| tree | ed3f669fbb4422bf3dfaa6b20ea992c04c1eac01 /mm/gup.c | |
| parent | 084eedbddaa526f53b20291ee7176be269620301 (diff) | |
| parent | 92905e331aea278665c4b27fbb13c4547a8bcbb0 (diff) | |
Merge tag 'v4.9.35' into linux-linaro-lsk-v4.9lsk-v4.9-17.06
This is the 4.9.35 stable release
Diffstat (limited to 'mm/gup.c')
| -rw-r--r-- | mm/gup.c | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -370,11 +370,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) |