diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-05 11:22:41 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-05 11:22:41 -0400 |
| commit | 273cb6c93cf422748a28834bca3f1f114afaded4 (patch) | |
| tree | bbd083c18e1983105f9e70a8601764a3b180f320 | |
| parent | 9db2faf4d248418f2358020f55f558aff2abdebf (diff) | |
| download | 4.8-rt-patches-273cb6c93cf422748a28834bca3f1f114afaded4.tar.gz | |
mm: workingset refresh for {
| -rw-r--r-- | patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch | 16 |
1 files changed, 8 insertions, 8 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 0df0a7a40e14db..cbd8270cf0e3c7 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 d974c16a899111fec31441c86f4c2930cbb7f351 Mon Sep 17 00:00:00 2001 +From a8754c57e600bea99f9984254555c71502673521 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 @@ -12,7 +12,7 @@ so I catch users of it which will be introduced later. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> diff --git a/include/linux/swap.h b/include/linux/swap.h -index 0af2bb2028fd..98d34df40058 100644 +index b17cc4830fa6..0afb7449dfc0 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -11,6 +11,7 @@ @@ -23,7 +23,7 @@ index 0af2bb2028fd..98d34df40058 100644 #include <asm/page.h> struct notifier_block; -@@ -252,7 +253,8 @@ struct swap_info_struct { +@@ -243,7 +244,8 @@ struct swap_info_struct { void *workingset_eviction(struct address_space *mapping, struct page *page); bool workingset_refault(void *shadow); void workingset_activation(struct page *page); @@ -34,7 +34,7 @@ index 0af2bb2028fd..98d34df40058 100644 static inline unsigned int workingset_node_pages(struct radix_tree_node *node) { diff --git a/mm/filemap.c b/mm/filemap.c -index e90c1543ec2d..fda05f28040e 100644 +index c5f5e46c6f7f..314f507727ec 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -159,8 +159,10 @@ static void page_cache_tree_delete(struct address_space *mapping, @@ -84,10 +84,10 @@ index a01cce450a26..4bda37604f99 100644 unlock: spin_unlock_irq(&mapping->tree_lock); diff --git a/mm/workingset.c b/mm/workingset.c -index 577277546d98..1565f4d66ce0 100644 +index 69551cfae97b..35a46ad0c335 100644 --- a/mm/workingset.c +++ b/mm/workingset.c -@@ -335,7 +335,8 @@ out: +@@ -334,7 +334,8 @@ out: * point where they would still be useful. */ @@ -97,7 +97,7 @@ index 577277546d98..1565f4d66ce0 100644 static unsigned long count_shadow_nodes(struct shrinker *shrinker, struct shrink_control *sc) -@@ -345,9 +346,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, +@@ -344,9 +345,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, unsigned long pages; /* list_lru lock nests inside IRQ-safe mapping->tree_lock */ @@ -108,7 +108,7 @@ index 577277546d98..1565f4d66ce0 100644 + shadow_nodes = list_lru_shrink_count(&__workingset_shadow_nodes, sc); + local_unlock_irq(workingset_shadow_lock); - if (memcg_kmem_enabled()) + if (memcg_kmem_enabled()) { pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid, @@ -440,9 +441,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, spin_unlock(&mapping->tree_lock); |