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 ea736e4c9c86e3b35ece5e755fd2db51093447f9..3320ba8b0f73efe4db80b71ddce56fedbe5bf0e6 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
@@ -77,11 +77,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  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 <gregkh@linuxfoundation.org>
  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;
  }