|
@@ -2350,19 +2350,11 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
|
|
|
list_del(&page->lru);
|
|
|
pcp->count--;
|
|
|
} else {
|
|
|
- if (unlikely(gfp_flags & __GFP_NOFAIL)) {
|
|
|
- /*
|
|
|
- * __GFP_NOFAIL is not to be used in new code.
|
|
|
- *
|
|
|
- * All __GFP_NOFAIL callers should be fixed so that they
|
|
|
- * properly detect and handle allocation failures.
|
|
|
- *
|
|
|
- * We most definitely don't want callers attempting to
|
|
|
- * allocate greater than order-1 page units with
|
|
|
- * __GFP_NOFAIL.
|
|
|
- */
|
|
|
- WARN_ON_ONCE(order > 1);
|
|
|
- }
|
|
|
+ /*
|
|
|
+ * We most definitely don't want callers attempting to
|
|
|
+ * allocate greater than order-1 page units with __GFP_NOFAIL.
|
|
|
+ */
|
|
|
+ WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
|
|
|
spin_lock_irqsave(&zone->lock, flags);
|
|
|
|
|
|
page = NULL;
|