diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-01 12:55:09 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-01 12:55:09 -0800 |
| commit | c8da41f0dc8d6cf25494b8462bf5875bda2e3568 (patch) | |
| tree | 395862f05525f0f1ee87cb680891d1831f5cf021 /mm/memcontrol.c | |
| parent | e9a82a4cbe64b78d72c3adaea73352d2b9bab895 (diff) | |
| parent | 6c1ed78cb07494c721e9849c92987d029a2e816f (diff) | |
Merge tag 'v4.4.46' into android-4.4.y
This is the 4.4.46 stable release
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5d9c8a3136bc..43eefe9d834c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4496,9 +4496,9 @@ static int mem_cgroup_do_precharge(unsigned long count) return ret; } - /* Try charges one by one with reclaim */ + /* Try charges one by one with reclaim, but do not retry */ while (count--) { - ret = try_charge(mc.to, GFP_KERNEL & ~__GFP_NORETRY, 1); + ret = try_charge(mc.to, GFP_KERNEL | __GFP_NORETRY, 1); if (ret) return ret; mc.precharge++; |