diff --git a/[refs] b/[refs]
index da37a7209ce1..9d35a231c1e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad8a1b558e6c76fb53901956d3c8f29b82a4ccfa
+refs/heads/master: f6d7e0cb3ecc248e98fa11d83253f6174bd7e085
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 91812df1351a..66f172fdf5fe 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -313,7 +313,7 @@ static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
 static inline struct page *alloc_pages_exact_node(int nid, gfp_t gfp_mask,
 						unsigned int order)
 {
-	VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES);
+	VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES || !node_online(nid));
 
 	return __alloc_pages(gfp_mask, order, node_zonelist(nid, gfp_mask));
 }