X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fmempool.c;h=65f2957b8d518b7a6d244a339fd4dc5ce85ab9a9;hb=d44ed4f86892e350f4b16a3489b7e7c1a9bb7ead;hp=920c8c3ab1b8f4a54ce752a46c5f6a5a11bd2d72;hpb=1946089a109251655c5438d92c539bd2930e71ea;p=linux-2.6

diff --git a/mm/mempool.c b/mm/mempool.c
index 920c8c3ab1..65f2957b8d 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -204,8 +204,8 @@ void * mempool_alloc(mempool_t *pool, unsigned int __nocast gfp_mask)
 {
 	void *element;
 	unsigned long flags;
-	DEFINE_WAIT(wait);
-	int gfp_temp;
+	wait_queue_t wait;
+	unsigned int gfp_temp;
 
 	might_sleep_if(gfp_mask & __GFP_WAIT);
 
@@ -235,6 +235,7 @@ repeat_alloc:
 
 	/* 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)