updated queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch with Hugh's update

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 3320ba8b0f73efe4db80b71ddce56fedbe5bf0e6..6ca28f0d0383e8f5afe4871361a37332ddf06a4f 100644 (file)
--- a/queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch
+++ b/queue-3.18/mm-larger-stack-guard-gap-between-vmas.patch
@@ -78,10 +78,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/hugetlbfs/inode.c                |    2 
  fs/proc/task_mmu.c                  |    4 
  include/linux/mm.h                  |   53 ++++++------
- mm/gup.c                            |    6 -
+ mm/gup.c                            |    5 -
  mm/memory.c                         |   38 ---------
- mm/mmap.c                           |  147 +++++++++++++++++++++---------------
- 20 files changed, 148 insertions(+), 156 deletions(-)
+ mm/mmap.c                           |  149 +++++++++++++++++++++---------------
+ 20 files changed, 147 insertions(+), 158 deletions(-)
 
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
@@ -417,7 +417,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 --- a/mm/gup.c
 +++ b/mm/gup.c
-@@ -275,10 +275,8 @@ static int faultin_page(struct task_stru
+@@ -275,11 +275,6 @@ static int faultin_page(struct task_stru
        unsigned int fault_flags = 0;
        int ret;
  
@@ -425,11 +425,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -      if ((*flags & FOLL_MLOCK) &&
 -                      (stack_guard_page_start(vma, address) ||
 -                       stack_guard_page_end(vma, address + PAGE_SIZE)))
-+      /* mlock all present pages, but do not fault in new pages */
-+      if (*flags & FOLL_MLOCK)
-               return -ENOENT;
+-              return -ENOENT;
        if (*flags & FOLL_WRITE)
                fault_flags |= FAULT_FLAG_WRITE;
+       if (nonblocking)
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -2580,40 +2580,6 @@ out_release:
@@ -558,6 +557,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        else if (!adjust_next)
                                vma_gap_update(next);
                }
+@@ -917,7 +931,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);
 @@ -1740,7 +1754,7 @@ unsigned long unmapped_area(struct vm_un
  
        while (true) {