From 3dda4fef70342905691b889b2918ff3f587ce063 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Tue, 4 Mar 2008 12:24:22 -0800
Subject: [PATCH] --- yaml --- r: 87050 b: refs/heads/master c:
 9ac33b2b749e9539e84bbb1a41f97b066c4bd757 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 665a96e40b20..3033cae11e42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b773ad73690b5f34eee0c76f4273ac6fcbd88f82
+refs/heads/master: 9ac33b2b749e9539e84bbb1a41f97b066c4bd757
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 473e6c2eaefb..5d16c8a30499 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3280,7 +3280,7 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 		if (local_flags & __GFP_WAIT)
 			local_irq_enable();
 		kmem_flagcheck(cache, flags);
-		obj = kmem_getpages(cache, flags, -1);
+		obj = kmem_getpages(cache, local_flags, -1);
 		if (local_flags & __GFP_WAIT)
 			local_irq_disable();
 		if (obj) {