Merge branch 'akpm' (patches from Andrew) (3c49de52) · Commits · 戴 / test

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

mm/vmscan.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

mm/workingset.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {

Admin message