---

yaml --- r: 2963 b: refs/heads/master c: 01890a4 h: refs/heads/master i: 2961: 7083b8f 2959: 89c8d00 v: v3
git-mirror · Jun 23, 2005 · 678fa05 · 678fa05
1 parent 9998e5a
commit 678fa05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)