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

2 files changed, 3 insertions, 1 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 76fda2268148..d75cdf360730 100644
--- 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
index 617475f529f4..fb1f9183d89a 100644
--- 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 {