1 files changed, 4 insertions, 7 deletions

diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
index 7415839ac890..66d25917cea0 100644
--- a/include/linux/semaphore.h
+++ b/include/linux/semaphore.h
@@ -14,20 +14,20 @@
 
 /* Please don't access any members of this structure directly */
 struct semaphore {
-        spinlock_t              lock;
+        raw_spinlock_t          lock;
         unsigned int            count;
         struct list_head        wait_list;
 };
 
 #define __SEMAPHORE_INITIALIZER(name, n)                                \
 {                                                                       \
-        .lock           = __SPIN_LOCK_UNLOCKED((name).lock),            \
+        .lock           = __RAW_SPIN_LOCK_UNLOCKED((name).lock),        \
         .count          = n,                                            \
         .wait_list      = LIST_HEAD_INIT((name).wait_list),             \
 }
 
-#define DECLARE_MUTEX(name)     \
-        struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1)
+#define DEFINE_SEMAPHORE(name, val)                                     \
+        struct semaphore name = __SEMAPHORE_INITIALIZER(name, val)
 
 static inline void sema_init(struct semaphore *sem, int val)
 {
@@ -36,9 +36,6 @@ static inline void sema_init(struct semaphore *sem, int val)
         lockdep_init_map(&sem->lock.dep_map, "semaphore->lock", &__key, 0);
 }
 
-#define init_MUTEX(sem)         sema_init(sem, 1)
-#define init_MUTEX_LOCKED(sem)  sema_init(sem, 0)
-
 extern void down(struct semaphore *sem);
 extern int __must_check down_interruptible(struct semaphore *sem);
 extern int __must_check down_killable(struct semaphore *sem);