]> err.no Git - linux-2.6/commitdiff
slab numa fallback logic: Do not pass unfiltered flags to page allocator
authorChristoph Lameter <clameter@sgi.com>
Tue, 4 Mar 2008 20:24:22 +0000 (12:24 -0800)
committerChristoph Lameter <clameter@sgi.com>
Fri, 7 Mar 2008 00:21:49 +0000 (16:21 -0800)
The NUMA fallback logic should be passing local_flags to kmem_get_pages() and not simply the
flags passed in.

Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
mm/slab.c

index 473e6c2eaefbcafbba74b7e37a658422027e968e..5d16c8a30499e11d77c9a13e08ea571a274e4246 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3280,7 +3280,7 @@ retry:
                if (local_flags & __GFP_WAIT)
                        local_irq_enable();
                kmem_flagcheck(cache, flags);
-               obj = kmem_getpages(cache, flags, -1);
+               obj = kmem_getpages(cache, local_flags, -1);
                if (local_flags & __GFP_WAIT)
                        local_irq_disable();
                if (obj) {