fix up 3.18 patch

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 f7342262f1304755b761d628dc6a84436dab9050..ea736e4c9c86e3b35ece5e755fd2db51093447f9 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
@@ -58,6 +58,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 [wt: backport to 3.18: adjust context ; no FOLL_POPULATE ;
      s390 uses generic arch_get_unmapped_area()]
 Signed-off-by: Willy Tarreau <w@1wt.eu>
+[gkh: minor build fixes for 3.18]
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  Documentation/kernel-parameters.txt |    7 +
@@ -76,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                  |   57 ++++++-------
+ include/linux/mm.h                  |   54 ++++++-------
  mm/gup.c                            |    6 -
  mm/memory.c                         |   38 ---------
  mm/mmap.c                           |  147 +++++++++++++++++++++---------------
- 20 files changed, 148 insertions(+), 160 deletions(-)
+ 20 files changed, 148 insertions(+), 157 deletions(-)
 
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
@@ -340,7 +341,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1242,37 +1242,6 @@ int set_page_dirty_lock(struct page *pag
+@@ -1242,34 +1242,6 @@ int set_page_dirty_lock(struct page *pag
  int clear_page_dirty_for_io(struct page *page);
  int get_cmdline(struct task_struct *task, char *buffer, int buflen);
  
@@ -372,13 +373,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -              !vma_growsup(vma->vm_next, addr);
 -}
 -
--extern struct task_struct *task_of_stack(struct task_struct *task,
--                              struct vm_area_struct *vma, bool in_group);
--
- 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,
-@@ -1928,7 +1897,7 @@ void page_cache_async_readahead(struct a
+ 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);
  
@@ -387,7 +385,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  /* 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 +1927,30 @@ static inline struct vm_area_struct * fi
+@@ -1958,6 +1930,30 @@ static inline struct vm_area_struct * fi
        return vma;
  }
  

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 9a44d4727fed2db7ca89dff348b6a7365da30485..46b311b1fb82f3a47304c025a9e18f1dcdb26cc3 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
@@ -56,6 +56,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 [wt: backport to 4.9: adjust context ; kernel doc was not in admin-guide]
 [wt: backport to 4.4: adjust context ; drop ppc hugetlb_radix changes]
 Signed-off-by: Willy Tarreau <w@1wt.eu>
+[gkh: minor build fixes for 4.4]
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  Documentation/kernel-parameters.txt |    7 +