Driver core: add device_type to struct device

[linux-2.6-omap-h63xx.git] / mm / mempool.c

diff --git a/mm/mempool.c b/mm/mempool.c
index fe6e05289cc5b5b7b30f036980fb7ea3835892e0..ccd8cb8cd41f59fc19e2198bfb2862ad72d62ff9 100644 (file)
--- 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;