Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 819a6928 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
[ Changed 0 to numa_node_id() on suggestion by Christoph Lameter ]
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1584b89c

include/linux/gfp.h

+4 −0
Original line number Diff line number Diff line
@@ -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));

}