From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 04:03:01 +0000 (+1100)
Subject: Merge remote-tracking branch 'cgroup/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~48
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=575fab4d35542fc2c928dcb9da25b15ca9520210

Merge remote-tracking branch 'cgroup/for-next'
---

575fab4d35542fc2c928dcb9da25b15ca9520210
diff --cc mm/vmscan.c
index 7f63a9381f71,2d978b28a410..e7057af54b6e
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@@ -175,7 -175,7 +175,7 @@@ static bool sane_reclaim(struct scan_co
  	if (!memcg)
  		return true;
  #ifdef CONFIG_CGROUP_WRITEBACK
- 	if (cgroup_on_dfl(memcg->css.cgroup))
 -	if (memcg->css.cgroup)
++	if (cgroup_subsys_on_dfl(memory_cgrp_subsys))
  		return true;
  #endif
  	return false;