summaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-27 20:56:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-27 20:56:33 -0700
commite72e9c23ee025a4c063ca112ba0a6059f9ecc9b7 (patch)
treed4b7091cf0e021fec776cbefbdb1ea8aec116d6a /mm/slub.c
parent8536bbaff44addff8d2ac66da1156c95b1e00c4e (diff)
downloadop-kernel-dev-e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7.zip
op-kernel-dev-e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7.tar.gz
Revert "SLUB: remove useless masking of GFP_ZERO"
This reverts commit 3811dbf67162bd08412f1b0e02e554f353e93bdb. The masking was not at all useless, and it was sensible. We handle GFP_ZERO in the caller, and passing it down to any page allocator logic is buggy and wrong. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c
index b72bc98..84ed734 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1470,6 +1470,9 @@ 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;
OpenPOWER on IntegriCloud