aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/memcontrol.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f7b6bec9f538..a73f3947f5d9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2613,13 +2613,13 @@ retry:
2613 if (!(gfp_mask & __GFP_WAIT)) 2613 if (!(gfp_mask & __GFP_WAIT))
2614 goto nomem; 2614 goto nomem;
2615 2615
2616 if (gfp_mask & __GFP_NORETRY)
2617 goto nomem;
2618
2619 nr_reclaimed = mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags); 2616 nr_reclaimed = mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags);
2620 2617
2621 if (mem_cgroup_margin(mem_over_limit) >= batch) 2618 if (mem_cgroup_margin(mem_over_limit) >= batch)
2622 goto retry; 2619 goto retry;
2620
2621 if (gfp_mask & __GFP_NORETRY)
2622 goto nomem;
2623 /* 2623 /*
2624 * Even though the limit is exceeded at this point, reclaim 2624 * Even though the limit is exceeded at this point, reclaim
2625 * may have been able to free some pages. Retry the charge 2625 * may have been able to free some pages. Retry the charge