diff options
author | Christoph Lameter <clameter@sgi.com> | 2007-12-17 19:20:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 22:28:17 -0500 |
commit | 3811dbf67162bd08412f1b0e02e554f353e93bdb (patch) | |
tree | eacc81b9fdc23d7b51ab07fccbfe7950563a1de9 | |
parent | 087ee8d5bec1aa6d0a1dfe3067c7298375462ceb (diff) |
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>
-rw-r--r-- | mm/slub.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1468,9 +1468,6 @@ static void *__slab_alloc(struct kmem_cache *s, | |||
1468 | void **object; | 1468 | void **object; |
1469 | struct page *new; | 1469 | struct page *new; |
1470 | 1470 | ||
1471 | /* We handle __GFP_ZERO in the caller */ | ||
1472 | gfpflags &= ~__GFP_ZERO; | ||
1473 | |||
1474 | if (!c->page) | 1471 | if (!c->page) |
1475 | goto new_slab; | 1472 | goto new_slab; |
1476 | 1473 | ||