Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/loop.h b/include/linux/loop.h
index 6492181bcb1d..460b60fa7adf 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -53,10 +53,13 @@ struct loop_device {
 
         spinlock_t              lo_lock;
         struct bio_list         lo_bio_list;
+        unsigned int            lo_bio_count;
         int                     lo_state;
         struct mutex            lo_ctl_mutex;
         struct task_struct      *lo_thread;
         wait_queue_head_t       lo_event;
+        /* wait queue for incoming requests */
+        wait_queue_head_t       lo_req_wait;
 
         struct request_queue    *lo_queue;
         struct gendisk          *lo_disk;