Parcourir la source

[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>
Andi Kleen il y a 19 ans
Parent
commit
819a692804
1 fichiers modifiés avec 4 ajouts et 0 suppressions
  1. 4 0
      include/linux/gfp.h

+ 4 - 0
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))
 	if (unlikely(order >= MAX_ORDER))
 		return NULL;
 		return NULL;
 
 
+	/* Unknown node is current node */
+	if (nid < 0)
+		nid = numa_node_id();
+
 	return __alloc_pages(gfp_mask, order,
 	return __alloc_pages(gfp_mask, order,
 		NODE_DATA(nid)->node_zonelists + gfp_zone(gfp_mask));
 		NODE_DATA(nid)->node_zonelists + gfp_zone(gfp_mask));
 }
 }