X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mm%2Fmemcontrol.c;h=34d3ca9572d6baed85499d099a0050af3b9bdf66;hb=84235de394d9775bfaa7fa9762a59d91fef0c1fc;hp=65fc6a4498411332478c92d7ccf473a1cd341e53;hpb=4942642080ea82d99ab5b653abb9a12b7ba31f4a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 65fc6a4..34d3ca9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2766,6 +2766,8 @@ done:
 	return 0;
 nomem:
 	*ptr = NULL;
+	if (gfp_mask & __GFP_NOFAIL)
+		return 0;
 	return -ENOMEM;
 bypass:
 	*ptr = root_mem_cgroup;