X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fmempool.c;h=ccd8cb8cd41f59fc19e2198bfb2862ad72d62ff9;hb=8da81e52b743edac0bfbb7d0c1286f919b2f209b;hp=fe6e05289cc5b5b7b30f036980fb7ea3835892e0;hpb=55d8ca4f8094246da6e71889a4e04bfafaa78b10;p=powerpc.git

diff --git a/mm/mempool.c b/mm/mempool.c
index fe6e05289c..ccd8cb8cd4 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -238,8 +238,13 @@ repeat_alloc:
 	init_wait(&wait);
 	prepare_to_wait(&pool->wait, &wait, TASK_UNINTERRUPTIBLE);
 	smp_mb();
-	if (!pool->curr_nr)
-		io_schedule();
+	if (!pool->curr_nr) {
+		/*
+		 * FIXME: this should be io_schedule().  The timeout is there
+		 * as a workaround for some DM problems in 2.6.18.
+		 */
+		io_schedule_timeout(5*HZ);
+	}
 	finish_wait(&pool->wait, &wait);
 
 	goto repeat_alloc;