summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-03-04 12:24:22 -0800
committerChristoph Lameter <clameter@sgi.com>2008-03-06 16:21:49 -0800
commit9ac33b2b749e9539e84bbb1a41f97b066c4bd757 (patch)
tree3d00a7ad98e27a813e6d855fbeaf5cef5e783b96 /mm
parentb773ad73690b5f34eee0c76f4273ac6fcbd88f82 (diff)
downloadlinux-3.10-9ac33b2b749e9539e84bbb1a41f97b066c4bd757.tar.gz
linux-3.10-9ac33b2b749e9539e84bbb1a41f97b066c4bd757.tar.bz2
linux-3.10-9ac33b2b749e9539e84bbb1a41f97b066c4bd757.zip
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 473e6c2eaef..5d16c8a3049 100644
--- 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) {