summaryrefslogtreecommitdiff
path: root/include/linux/gfp.h
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 22:43:45 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:04:51 -0800
commit819a692804a8d2d42b7bb033d2650dba47622149 (patch)
treea3b614679c0ee42bec418c933d96e194884031d1 /include/linux/gfp.h
parent1584b89c921acefe88881f08d836d80f00600a84 (diff)
downloadlinux-3.10-819a692804a8d2d42b7bb033d2650dba47622149.tar.gz
linux-3.10-819a692804a8d2d42b7bb033d2650dba47622149.tar.bz2
linux-3.10-819a692804a8d2d42b7bb033d2650dba47622149.zip
[PATCH] x86_64: Handle unknown node (-1) in alloc_pages_node
Following kmalloc_node. Needed for another patch to return -1 for unknown nodes in x86-64. Cc: Christoph Lameter <clameter@engr.sgi.com> Cc: kiran@scalex86.org Signed-off-by: Andi Kleen <ak@suse.de> [ Changed 0 to numa_node_id() on suggestion by Christoph Lameter ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/gfp.h')
-rw-r--r--include/linux/gfp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index da7ce8730e9..20f9148e38d 100644
--- a/include/linux/gfp.h
+++ b/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));
}