X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fmemcontrol.c;h=0a2e19455ca65622c7501562dab549ddaeb9908a;hb=6cd7160544b68eeb747f0da81e1a3e3aeb4e87e3;hp=17dfe70f3309778e92d6968ed87b15d4baa7897a;hpb=19192a140ad72b5bd0d57620bfe236bc03561bb6;p=firefly-linux-kernel-4.4.55.git

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 17dfe70f3309..0a2e19455ca6 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++;