aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-12-17 16:20:27 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 19:28:17 -0800
commit3811dbf67162bd08412f1b0e02e554f353e93bdb (patch)
treeeacc81b9fdc23d7b51ab07fccbfe7950563a1de9 /mm
parentFix compilation warning in dquot.c (diff)
downloadlinux-dev-3811dbf67162bd08412f1b0e02e554f353e93bdb.tar.xz
linux-dev-3811dbf67162bd08412f1b0e02e554f353e93bdb.zip
SLUB: remove useless masking of GFP_ZERO
Remove a recently added useless masking of GFP_ZERO. GFP_ZERO is already masked out in new_slab() (See how it calls allocate_slab). No need to do it twice. This reverts the SLUB parts of 7fd272550bd43cc1d7289ef0ab2fa50de137e767. Cc: Matt Mackall <mpm@selenic.com> Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 9c1d9f3b364f..b9f37cb0f2e6 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1468,9 +1468,6 @@ static void *__slab_alloc(struct kmem_cache *s,
void **object;
struct page *new;
- /* We handle __GFP_ZERO in the caller */
- gfpflags &= ~__GFP_ZERO;
-
if (!c->page)
goto new_slab;