Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/loop.h b/include/linux/loop.h
index f96506782ebe..e76c7611d6cc 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -17,6 +17,7 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 
 /* Possible states of device */
 enum {
@@ -60,7 +61,7 @@ struct loop_device {
         int                     lo_state;
         struct completion       lo_done;
         struct completion       lo_bh_done;
-        struct semaphore        lo_ctl_mutex;
+        struct mutex            lo_ctl_mutex;
         int                     lo_pending;
 
         request_queue_t         *lo_queue;