From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 4 Aug 2010 19:04:43 +0000 (+0300)
Subject: Merge branches 'slab/fixes', 'slob/fixes', 'slub/cleanups' and 'slub/fixes' into... 
X-Git-Tag: v2.6.36-rc1~519^2
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=415cb47998c54195710d413c3d95e37a9339c1e8;p=karo-tx-linux.git

Merge branches 'slab/fixes', 'slob/fixes', 'slub/cleanups' and 'slub/fixes' into for-linus
---

415cb47998c54195710d413c3d95e37a9339c1e8
diff --cc mm/slub.c
index 578f68f3c51f,578f68f3c51f,578f68f3c51f,fb6518efe1ed,39d39653239b..fba51d6d4cc4
--- a/mm/slub.c
+++ b/mm/slub.c
@@@@@@ -1387,10 -1387,10 -1387,10 -1389,10 -1387,10 +1389,10 @@@@@@ static struct page *get_any_partial(str
     static struct page *get_partial(struct kmem_cache *s, gfp_t flags, int node)
     {
     	struct page *page;
--- -	int searchnode = (node == -1) ? numa_node_id() : node;
+++ +	int searchnode = (node == NUMA_NO_NODE) ? numa_node_id() : node;
     
     	page = get_partial_node(get_node(s, searchnode));
---- 	if (page || (flags & __GFP_THISNODE))
++++ 	if (page || node != -1)
     		return page;
     
     	return get_any_partial(s, flags);