diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 04:56:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 04:56:33 +0100 |
| commit | e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7 (patch) | |
| tree | d4b7091cf0e021fec776cbefbdb1ea8aec116d6a | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| download | linux-e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7.tar.xz linux-e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7.zip | |
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>
| -rw-r--r-- | mm/slub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c index b72bc98e2dc1..84ed734b96b3 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; |