summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-12-25 22:08:54 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2016-12-25 22:08:54 -0500
commit6d940a35f86edb0a9fe25cf60a2b5a7958b00af0 (patch)
tree8085fef560b7e74b2d4a4a0bb5ac0b0ec66aa6da
parente9bb7fa24407c8b983510dfc8a1dfc9dcd37c814 (diff)
download4.9-rt-patches-6d940a35f86edb0a9fe25cf60a2b5a7958b00af0.tar.gz
mm: workingset trivial ctxt refresh for interim patch
-rw-r--r--patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch b/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch
index d90f1537e4efe..f9572f03c2e2d 100644
--- a/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch
+++ b/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch
@@ -1,4 +1,4 @@
-From 918cf3e5b94891b7f557350d0d69c5f55b0e134c Mon Sep 17 00:00:00 2001
+From 9a158b5f0a7eff095045bfad05844306bf6a7fb1 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 29 Jan 2015 17:19:44 +0100
Subject: [PATCH] mm/workingset: Do not protect workingset_shadow_nodes with
@@ -18,7 +18,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
4 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
-index 4a529c984a3f..3d7ce719282c 100644
+index e1d761463243..7fb321333353 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -11,6 +11,7 @@
@@ -40,7 +40,7 @@ index 4a529c984a3f..3d7ce719282c 100644
static inline unsigned int workingset_node_pages(struct radix_tree_node *node)
{
diff --git a/mm/filemap.c b/mm/filemap.c
-index 2d0986a64f1f..38b6746958a3 100644
+index 4bad32dd4b3b..c30aefb7f1d7 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -159,9 +159,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
@@ -58,7 +58,7 @@ index 2d0986a64f1f..38b6746958a3 100644
}
return 0;
}
-@@ -215,8 +218,10 @@ static void page_cache_tree_delete(struct address_space *mapping,
+@@ -217,8 +220,10 @@ static void page_cache_tree_delete(struct address_space *mapping,
if (!dax_mapping(mapping) && !workingset_node_pages(node) &&
list_empty(&node->private_list)) {
node->private_data = mapping;
@@ -70,7 +70,7 @@ index 2d0986a64f1f..38b6746958a3 100644
+ local_unlock(workingset_shadow_lock);
}
}
- }
+
diff --git a/mm/truncate.c b/mm/truncate.c
index a01cce450a26..4bda37604f99 100644
--- a/mm/truncate.c