1 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index d2c142bc872e..4a12cae2fb0c 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -310,23 +310,23 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 static inline struct page *
 __alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order)
 {
-        VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES || !node_online(nid));
+        VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES);
+        VM_WARN_ON(!node_online(nid));
 
         return __alloc_pages(gfp_mask, order, node_zonelist(nid, gfp_mask));
 }
 
 /*
  * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE,
- * prefer the current CPU's node.
+ * prefer the current CPU's node. Otherwise node must be valid and online.
  */
 static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
                                                 unsigned int order)
 {
-        /* Unknown node is current node */
-        if (nid < 0)
+        if (nid == NUMA_NO_NODE)
                 nid = numa_node_id();
 
-        return __alloc_pages(gfp_mask, order, node_zonelist(nid, gfp_mask));
+        return __alloc_pages_node(nid, gfp_mask, order);
 }
 
 #ifdef CONFIG_NUMA