Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 block/ll_rw_blk.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN block/ll_rw_blk.c~unplug-can-sleep block/ll_rw_blk.c
--- a/block/ll_rw_blk.c~unplug-can-sleep
+++ a/block/ll_rw_blk.c
@@ -1642,6 +1642,7 @@ EXPORT_SYMBOL(__generic_unplug_device);
  **/
 void generic_unplug_device(request_queue_t *q)
 {
+	might_sleep();
 	spin_lock_irq(q->queue_lock);
 	__generic_unplug_device(q);
 	spin_unlock_irq(q->queue_lock);
_