Merge branch 'akpm' (patches from Andrew)

torvalds · torvalds · commit 3c49de52d564 · 2016-12-02T18:48:11.000-08:00
Merge more fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton &lt;akpm@linux-foundation.org&gt;:
  mm, vmscan: add cond_resched() into shrink_node_memcg()
  mm: workingset: fix NULL ptr in count_shadow_nodes
diff --git a/mm/vmscan.c b/mm/vmscan.c
@@ -2354,6 +2354,8 @@ static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memc
 			}
 		}
 
+		cond_resched();
+
 		if (nr_reclaimed < nr_to_reclaim || scan_adjusted)
 			continue;
 
diff --git a/mm/workingset.c b/mm/workingset.c
@@ -348,7 +348,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
 	shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);
 	local_irq_enable();
 
-	if (memcg_kmem_enabled()) {
+	if (sc->memcg) {
 		pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
 						     LRU_ALL_FILE);
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -2354,6 +2354,8 @@ static void shrink_node_memcg(struct pglist_data pgdat, struct mem_cgroup memc`
`2354`	`2354`	`}`
`2355`	`2355`	`}`
`2356`	`2356`
	`2357`	`+ cond_resched();`
	`2358`	`+`
`2357`	`2359`	`if (nr_reclaimed < nr_to_reclaim \|\| scan_adjusted)`
`2358`	`2360`	`continue;`
`2359`	`2361`