aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-03-04 15:24:22 -0500
committerChristoph Lameter <clameter@sgi.com>2008-03-06 19:21:49 -0500
commit9ac33b2b749e9539e84bbb1a41f97b066c4bd757 (patch)
tree3d00a7ad98e27a813e6d855fbeaf5cef5e783b96
parentb773ad73690b5f34eee0c76f4273ac6fcbd88f82 (diff)
slab numa fallback logic: Do not pass unfiltered flags to page allocator
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>
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 473e6c2eaefb..5d16c8a30499 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3280,7 +3280,7 @@ retry:
3280 if (local_flags & __GFP_WAIT) 3280 if (local_flags & __GFP_WAIT)
3281 local_irq_enable(); 3281 local_irq_enable();
3282 kmem_flagcheck(cache, flags); 3282 kmem_flagcheck(cache, flags);
3283 obj = kmem_getpages(cache, flags, -1); 3283 obj = kmem_getpages(cache, local_flags, -1);
3284 if (local_flags & __GFP_WAIT) 3284 if (local_flags & __GFP_WAIT)
3285 local_irq_disable(); 3285 local_irq_disable();
3286 if (obj) { 3286 if (obj) {