3 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 7fc01b13be43..455a29d02a0f 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -159,7 +159,7 @@ extern struct cred init_cred;
         .journal_info   = NULL,                                         \
         .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
         .fs_excl        = ATOMIC_INIT(0),                               \
-        .pi_lock        = __SPIN_LOCK_UNLOCKED(tsk.pi_lock),            \
+        .pi_lock        = __ATOMIC_SPIN_LOCK_UNLOCKED(tsk.pi_lock),     \
         .timer_slack_ns = 50000, /* 50 usec default slack */            \
         .pids = {                                                       \
                 [PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),            \
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index f19b00b7d530..dd9612d436e2 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -24,7 +24,7 @@
  * @owner:      the mutex owner
  */
 struct rt_mutex {
-        spinlock_t              wait_lock;
+        atomic_spinlock_t       wait_lock;
         struct plist_head       wait_list;
         struct task_struct      *owner;
 #ifdef CONFIG_DEBUG_RT_MUTEXES
@@ -63,8 +63,8 @@ struct hrtimer_sleeper;
 #endif
 
 #define __RT_MUTEX_INITIALIZER(mutexname) \
-        { .wait_lock = __SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
-        , .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
+        { .wait_lock = __ATOMIC_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
+        , .wait_list = PLIST_HEAD_INIT_ATOMIC(mutexname.wait_list, mutexname.wait_lock) \
         , .owner = NULL \
         __DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
 
@@ -98,7 +98,7 @@ extern void rt_mutex_unlock(struct rt_mutex *lock);
 
 #ifdef CONFIG_RT_MUTEXES
 # define INIT_RT_MUTEXES(tsk)                                           \
-        .pi_waiters     = PLIST_HEAD_INIT(tsk.pi_waiters, tsk.pi_lock), \
+        .pi_waiters     = PLIST_HEAD_INIT_ATOMIC(tsk.pi_waiters, tsk.pi_lock),  \
         INIT_RT_MUTEX_DEBUG(tsk)
 #else
 # define INIT_RT_MUTEXES(tsk)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3ab08e4bb6b8..792afc3be264 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1347,7 +1347,7 @@ struct task_struct {
 #endif
 
         /* Protection of the PI data structures: */
-        spinlock_t pi_lock;
+        atomic_spinlock_t pi_lock;
 
 #ifdef CONFIG_RT_MUTEXES
         /* PI waiters blocked on a rt_mutex held by this task */