OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8536bba
)
Revert "SLUB: remove useless masking of GFP_ZERO"
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 28 Mar 2008 03:56:33 +0000
(20:56 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 28 Mar 2008 03:56:33 +0000
(20:56 -0700)
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>
mm/slub.c
patch
|
blob
|
history
diff --git
a/mm/slub.c
b/mm/slub.c
index
b72bc98
..
84ed734
100644
(file)
--- 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;