|
@@ -2525,8 +2525,15 @@ rebalance:
|
|
}
|
|
}
|
|
|
|
|
|
/* Atomic allocations - we can't balance anything */
|
|
/* Atomic allocations - we can't balance anything */
|
|
- if (!wait)
|
|
|
|
|
|
+ if (!wait) {
|
|
|
|
+ /*
|
|
|
|
+ * All existing users of the deprecated __GFP_NOFAIL are
|
|
|
|
+ * blockable, so warn of any new users that actually allow this
|
|
|
|
+ * type of allocation to fail.
|
|
|
|
+ */
|
|
|
|
+ WARN_ON_ONCE(gfp_mask & __GFP_NOFAIL);
|
|
goto nopage;
|
|
goto nopage;
|
|
|
|
+ }
|
|
|
|
|
|
/* Avoid recursion of direct reclaim */
|
|
/* Avoid recursion of direct reclaim */
|
|
if (current->flags & PF_MEMALLOC)
|
|
if (current->flags & PF_MEMALLOC)
|