From: Greg Kroah-Hartman Date: Mon, 19 Jun 2017 16:06:25 +0000 (+0800) Subject: more 3.18 patch fixups X-Git-Tag: v4.11.7~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc7bc02e89ea71fb4b5eb638dd8dccb485a8f0de;p=thirdparty%2Fkernel%2Fstable-queue.git more 3.18 patch fixups --- diff --git a/queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch b/queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch index ea736e4c9c8..3320ba8b0f7 100644 --- a/queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch +++ b/queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch @@ -77,11 +77,11 @@ Signed-off-by: Greg Kroah-Hartman arch/xtensa/kernel/syscall.c | 2 fs/hugetlbfs/inode.c | 2 fs/proc/task_mmu.c | 4 - include/linux/mm.h | 54 ++++++------- + include/linux/mm.h | 53 ++++++------ mm/gup.c | 6 - mm/memory.c | 38 --------- mm/mmap.c | 147 +++++++++++++++++++++--------------- - 20 files changed, 148 insertions(+), 157 deletions(-) + 20 files changed, 148 insertions(+), 156 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -376,16 +376,15 @@ Signed-off-by: Greg Kroah-Hartman extern struct task_struct *task_of_stack(struct task_struct *task, struct vm_area_struct *vma, bool in_group); -@@ -1928,7 +1900,7 @@ void page_cache_async_readahead(struct a - pgoff_t offset, - unsigned long size); +@@ -1930,6 +1902,7 @@ void page_cache_async_readahead(struct a --unsigned long max_sane_readahead(unsigned long nr); -+extern unsigned long stack_guard_gap; + unsigned long max_sane_readahead(unsigned long nr); ++extern unsigned long stack_guard_gap; /* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */ extern int expand_stack(struct vm_area_struct *vma, unsigned long address); -@@ -1958,6 +1930,30 @@ static inline struct vm_area_struct * fi + +@@ -1958,6 +1931,30 @@ static inline struct vm_area_struct * fi return vma; }