From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Mar 2008 03:56:33 +0000 (-0700)
Subject: Revert "SLUB: remove useless masking of GFP_ZERO"
X-Git-Tag: v2.6.25-rc8~69
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e72e9c23ee025a4c063ca112ba0a6059f9ecc9b7;p=~emulex%2Finfiniband.git

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>
---

diff --git a/mm/slub.c b/mm/slub.c
index b72bc98e2dc..84ed734b96b 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;