]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up 4.9 mm patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Aug 2017 21:39:25 +0000 (14:39 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Aug 2017 21:39:25 +0000 (14:39 -0700)
queue-4.9/mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries.patch

index 4ba21cdb4ab573e1f886c6203bfce97fcafd930c..f35b8caec0ca2a40e0568a5b2c5b47640c993883 100644 (file)
@@ -72,12 +72,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  include/linux/mm_types.h |    4 ++++
  mm/internal.h            |    5 ++++-
- mm/madvise.c             |    +
+ mm/madvise.c             |    2 ++
  mm/memory.c              |    1 +
  mm/mprotect.c            |    1 +
  mm/mremap.c              |    1 +
  mm/rmap.c                |   36 ++++++++++++++++++++++++++++++++++++
- 7 files changed, 48 insertions(+), 1 deletion(-)
+ 7 files changed, 49 insertions(+), 1 deletion(-)
 
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
@@ -115,7 +115,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  extern const struct trace_print_flags pageflag_names[];
 --- a/mm/madvise.c
 +++ b/mm/madvise.c
-@@ -282,6 +282,7 @@ static int madvise_free_pte_range(pmd_t
+@@ -21,6 +21,7 @@
+ #include <linux/swap.h>
+ #include <linux/swapops.h>
+ #include <linux/mmu_notifier.h>
++#include "internal.h"
+ #include <asm/tlb.h>
+@@ -282,6 +283,7 @@ static int madvise_free_pte_range(pmd_t
                return 0;
  
        orig_pte = pte = pte_offset_map_lock(mm, pmd, addr, &ptl);