diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 16:14:24 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 16:14:24 +0200 |
| commit | bebcb8dab6bac53b6a61a896db03781d1992cadb (patch) | |
| tree | 4793b0c2e913db8cf573ee52d568471603273af6 /mm/vmscan.c | |
| parent | 26c21dd9885a2d8a4f4d539917c4877ffd399286 (diff) | |
| parent | f1e0bb0ad473a32d1b7e6d285ae9f7e47710bb5e (diff) | |
Merge branch 'irq/for-arm' into irq/core
Bring in the change which we offered arm[64] folks to pull into their
trees.
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 2d978b28a410..7f63a9381f71 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -175,7 +175,7 @@ static bool sane_reclaim(struct scan_control *sc) if (!memcg) return true; #ifdef CONFIG_CGROUP_WRITEBACK - if (memcg->css.cgroup) + if (cgroup_on_dfl(memcg->css.cgroup)) return true; #endif return false; |