From 48311153bbe973248116bddb14c0a5ae8e1c6bd6 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 13 Dec 2006 00:34:11 -0800
Subject: [PATCH] --- yaml --- r: 44445 b: refs/heads/master c:
 dd47ea755693228bf842c779e8afdfa47efb20a3 h: refs/heads/master i:   44443:
 544aca319c654d94bc5e4a63e0c10d64322af45d v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 825888289afa..ce3dc557b600 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a8ba9d12150461acc91bd3c9124eac19e853218
+refs/heads/master: dd47ea755693228bf842c779e8afdfa47efb20a3
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 2c655532f5ef..c7576b9027a6 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3252,6 +3252,7 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 	struct zone **z;
 	void *obj = NULL;
 	int nid;
+	gfp_t local_flags = (flags & GFP_LEVEL_MASK);
 
 retry:
 	/*
@@ -3275,7 +3276,12 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 		 * We may trigger various forms of reclaim on the allowed
 		 * set and go into memory reserves if necessary.
 		 */
+		if (local_flags & __GFP_WAIT)
+			local_irq_enable();
+		kmem_flagcheck(cache, flags);
 		obj = kmem_getpages(cache, flags, -1);
+		if (local_flags & __GFP_WAIT)
+			local_irq_disable();
 		if (obj) {
 			/*
 			 * Insert into the appropriate per node queues