From 34a46ed3e47d3fc1e36f6e8b49bf7ae022be6db5 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 11 Jan 2006 22:43:45 +0100
Subject: [PATCH] --- yaml --- r: 17953 b: refs/heads/master c:
 819a692804a8d2d42b7bb033d2650dba47622149 h: refs/heads/master i:   17951:
 79bf74f69ec70f52e5424b7992d9f0f2e88d9f4f v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/gfp.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5db7f6738470..b5e323bbbaf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1584b89c921acefe88881f08d836d80f00600a84
+refs/heads/master: 819a692804a8d2d42b7bb033d2650dba47622149
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index da7ce8730e97..20f9148e38d9 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -110,6 +110,10 @@ static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
 	if (unlikely(order >= MAX_ORDER))
 		return NULL;
 
+	/* Unknown node is current node */
+	if (nid < 0)
+		nid = numa_node_id();
+
 	return __alloc_pages(gfp_mask, order,
 		NODE_DATA(nid)->node_zonelists + gfp_zone(gfp_mask));
 }