diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:00 +0800 |
| commit | 267aa95e09eec438abf8979b58cded5cbc5586cb (patch) | |
| tree | 7401fc52691565f31c0ad96a94a7a54971cc6e6a /fs/proc/task_mmu.c | |
| parent | d87abdcbf8871b5ee58083b3bdf216ba406224b9 (diff) | |
| parent | 6ee496d7218aeccffe5380cb65e9d50d1a61c323 (diff) | |
Merge tag 'v4.4.75' into linux-linaro-lsk-v4.4lsk-v4.4-17.06
This is the 4.4.75 stable release
Diffstat (limited to 'fs/proc/task_mmu.c')
| -rw-r--r-- | fs/proc/task_mmu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index db1a1427c27a..07ef85e19fbc 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -295,11 +295,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) /* We don't show the stack guard page in /proc/maps */ start = vma->vm_start; - if (stack_guard_page_start(vma, start)) - start += PAGE_SIZE; end = vma->vm_end; - if (stack_guard_page_end(vma, end)) - end -= PAGE_SIZE; seq_setwidth(m, 25 + sizeof(void *) * 6 - 1); seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ", |