From 678fa05fce2c7c5f4ebf4f0d862181890197064b Mon Sep 17 00:00:00 2001
From: Benjamin LaHaise <bcrl@kvack.org>
Date: Thu, 23 Jun 2005 00:10:01 -0700
Subject: [PATCH] --- yaml --- r: 2963 b: refs/heads/master c:
 01890a4c120f68366441bf5e193d1b9dd543d4d0 h: refs/heads/master i:   2961:
 7083b8fbd5db268386105ef8ba7fbd390d187cfc   2959:
 89c8d00226d4222a8b72ccbca6752e09f0de84c7 v: v3

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

diff --git a/[refs] b/[refs]
index 3fab9d57e860..7418c0bfd504 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8476994af7bd9352ecdf61ba760f7397f54e30a1
+refs/heads/master: 01890a4c120f68366441bf5e193d1b9dd543d4d0
diff --git a/trunk/mm/mempool.c b/trunk/mm/mempool.c
index 920c8c3ab1b8..9a72f7d918fa 100644
--- a/trunk/mm/mempool.c
+++ b/trunk/mm/mempool.c
@@ -204,7 +204,7 @@ void * mempool_alloc(mempool_t *pool, unsigned int __nocast gfp_mask)
 {
 	void *element;
 	unsigned long flags;
-	DEFINE_WAIT(wait);
+	wait_queue_t wait;
 	int gfp_temp;
 
 	might_sleep_if(gfp_mask & __GFP_WAIT);
@@ -235,6 +235,7 @@ void * mempool_alloc(mempool_t *pool, unsigned int __nocast gfp_mask)
 
 	/* Now start performing page reclaim */
 	gfp_temp = gfp_mask;
+	init_wait(&wait);
 	prepare_to_wait(&pool->wait, &wait, TASK_UNINTERRUPTIBLE);
 	smp_mb();
 	if (!pool->curr_nr)