From: Greg Kroah-Hartman Date: Mon, 19 Jun 2017 15:41:46 +0000 (+0800) Subject: fix up queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch X-Git-Tag: v4.11.7~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07001a5006a9e036ba86ceba0f112fe2ae4ef722;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch --- diff --git a/queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch b/queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch index e91549ce478..9a44d4727fe 100644 --- a/queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch +++ b/queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch @@ -75,11 +75,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 | 55 ++++++------- + include/linux/mm.h | 53 ++++++------ mm/gup.c | 5 - mm/memory.c | 38 --------- mm/mmap.c | 147 +++++++++++++++++++++--------------- - 21 files changed, 148 insertions(+), 161 deletions(-) + 21 files changed, 148 insertions(+), 159 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -359,7 +359,7 @@ Signed-off-by: Greg Kroah-Hartman seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ", --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1278,41 +1278,11 @@ int clear_page_dirty_for_io(struct page +@@ -1278,39 +1278,11 @@ int clear_page_dirty_for_io(struct page int get_cmdline(struct task_struct *task, char *buffer, int buflen); @@ -396,12 +396,10 @@ Signed-off-by: Greg Kroah-Hartman - !vma_growsup(vma->vm_next, addr); -} - --int vma_is_stack_for_task(struct vm_area_struct *vma, struct task_struct *t); -- + int vma_is_stack_for_task(struct vm_area_struct *vma, struct task_struct *t); + extern unsigned long move_page_tables(struct vm_area_struct *vma, - unsigned long old_addr, struct vm_area_struct *new_vma, - unsigned long new_addr, unsigned long len, -@@ -2012,6 +1982,7 @@ void page_cache_async_readahead(struct a +@@ -2012,6 +1984,7 @@ void page_cache_async_readahead(struct a pgoff_t offset, unsigned long size); @@ -409,7 +407,7 @@ Signed-off-by: Greg Kroah-Hartman /* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */ extern int expand_stack(struct vm_area_struct *vma, unsigned long address); -@@ -2040,6 +2011,30 @@ static inline struct vm_area_struct * fi +@@ -2040,6 +2013,30 @@ static inline struct vm_area_struct * fi return vma; }