Merge branches 'slab/fixes', 'slob/fixes', 'slub/cleanups' and 'slub/fixes' into...

[lisovros/linux_canprio.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index fb6518efe1ed4ebfa511158229dc37ec45b9ee58..fba51d6d4cc44ee659e634eb65fb2e764063c8ac 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1392,7 +1392,7 @@ static struct page *get_partial(struct kmem_cache *s, gfp_t flags, int 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);