page allocator: do not check NUMA node ID when the caller knows the node is valid

[deliverable/linux.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 18e3164de09a9ce3b5c69b9fd53b6533b39e9486..bb3254c95cd246b7bd4e7addfe4438e55ae112be 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1707,7 +1707,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid)
        if (cachep->flags & SLAB_RECLAIM_ACCOUNT)
                flags |= __GFP_RECLAIMABLE;
 
-       page = alloc_pages_node(nodeid, flags, cachep->gfporder);
+       page = alloc_pages_exact_node(nodeid, flags, cachep->gfporder);
        if (!page)
                return NULL;
 
@@ -3261,7 +3261,7 @@ retry:
                if (local_flags & __GFP_WAIT)
                        local_irq_enable();
                kmem_flagcheck(cache, flags);
-               obj = kmem_getpages(cache, local_flags, -1);
+               obj = kmem_getpages(cache, local_flags, numa_node_id());
                if (local_flags & __GFP_WAIT)
                        local_irq_disable();
                if (obj) {