|
@@ -2373,7 +2373,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
/* Exhausted what can be done so it's blamo time */
|
|
/* Exhausted what can be done so it's blamo time */
|
|
- if (out_of_memory(ac->zonelist, gfp_mask, order, ac->nodemask, false))
|
|
|
|
|
|
+ if (out_of_memory(ac->zonelist, gfp_mask, order, ac->nodemask, false)
|
|
|
|
+ || WARN_ON_ONCE(gfp_mask & __GFP_NOFAIL))
|
|
*did_some_progress = 1;
|
|
*did_some_progress = 1;
|
|
out:
|
|
out:
|
|
oom_zonelist_unlock(ac->zonelist, gfp_mask);
|
|
oom_zonelist_unlock(ac->zonelist, gfp_mask);
|