From 6681f304ca0061f1394db38e945af011b28c21e6 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Mon, 17 Dec 2007 16:20:27 -0800
Subject: [PATCH] --- yaml --- r: 74994 b: refs/heads/master c:
 3811dbf67162bd08412f1b0e02e554f353e93bdb h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 967c79642b44..002898821c10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 087ee8d5bec1aa6d0a1dfe3067c7298375462ceb
+refs/heads/master: 3811dbf67162bd08412f1b0e02e554f353e93bdb
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 9c1d9f3b364f..b9f37cb0f2e6 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1468,9 +1468,6 @@ 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;