arm64: configs: rockchip_defconfig: enable rk3368 thermal

[firefly-linux-kernel-4.4.55.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 17dfe70f3309778e92d6968ed87b15d4baa7897a..0a2e19455ca65622c7501562dab549ddaeb9908a 100644 (file)
--- 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++;