From b1b4d50986c0c514cfd104296807cc860db52b99 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Mon, 26 Jul 2010 10:41:14 -0500 Subject: [PATCH] --- yaml --- r: 206080 b: refs/heads/master c: bc6488e91078af0b42ee0d8335e0587f64550d7d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d88959a71fcd..71db3ee6b64b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7adde04a2f5a798f04a556dfb3b69bff388e5dc4 +refs/heads/master: bc6488e91078af0b42ee0d8335e0587f64550d7d diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 578f68f3c51f..39d39653239b 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1390,7 +1390,7 @@ static struct page *get_partial(struct kmem_cache *s, gfp_t flags, int node) int searchnode = (node == -1) ? 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);