Commit 3c49de52 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'akpm' (patches from Andrew)

Merge more fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, vmscan: add cond_resched() into shrink_node_memcg()
  mm: workingset: fix NULL ptr in count_shadow_nodes
parents 86556392 bd041733
...@@ -2354,6 +2354,8 @@ static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memc ...@@ -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) if (nr_reclaimed < nr_to_reclaim || scan_adjusted)
continue; continue;
......
...@@ -348,7 +348,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, ...@@ -348,7 +348,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc); shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);
local_irq_enable(); local_irq_enable();
if (memcg_kmem_enabled()) { if (sc->memcg) {
pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid, pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
LRU_ALL_FILE); LRU_ALL_FILE);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment