From: Greg Kroah-Hartman Date: Sat, 24 Jun 2017 15:01:32 +0000 (+0200) Subject: Updated queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch with Hugh's comments X-Git-Tag: v3.18.58~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8c7db165dfe0b5a44b98cd6a7d22ad9f9b4f11d;p=thirdparty%2Fkernel%2Fstable-queue.git Updated queue-4.4/mm-larger-stack-guard-gap-between-vmas.patch with Hugh's comments --- 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 46b311b1fb8..482fc521391 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 @@ -79,8 +79,8 @@ Signed-off-by: Greg Kroah-Hartman include/linux/mm.h | 53 ++++++------ mm/gup.c | 5 - mm/memory.c | 38 --------- - mm/mmap.c | 147 +++++++++++++++++++++--------------- - 21 files changed, 148 insertions(+), 159 deletions(-) + mm/mmap.c | 149 +++++++++++++++++++++--------------- + 21 files changed, 149 insertions(+), 160 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -581,6 +581,15 @@ Signed-off-by: Greg Kroah-Hartman else if (!adjust_next) vma_gap_update(next); } +@@ -909,7 +923,7 @@ again: remove_next = 1 + (end > next-> + else if (next) + vma_gap_update(next); + else +- mm->highest_vm_end = end; ++ VM_WARN_ON(mm->highest_vm_end != vm_end_gap(vma)); + } + if (insert && file) + uprobe_mmap(insert); @@ -1741,7 +1755,7 @@ unsigned long unmapped_area(struct vm_un while (true) {