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 46b311b1fb82f3a47304c025a9e18f1dcdb26cc3..482fc5213915c99d4c2d724f5fa64acc90239c22 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
  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 <gregkh@linuxfoundation.org>
                        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) {