1 files changed, 9 insertions, 9 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 0773f2b23b10..5d6ce6413ef1 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1191,7 +1191,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
         if (pi_state->owner != current)
                 return -EINVAL;
 
-        raw_spin_lock(&pi_state->pi_mutex.wait_lock);
+        raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
         new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);
 
         /*
@@ -1217,22 +1217,22 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
         else if (curval != uval)
                 ret = -EINVAL;
         if (ret) {
-                raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
+                raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
                 return ret;
         }
 
-        raw_spin_lock_irq(&pi_state->owner->pi_lock);
+        raw_spin_lock(&pi_state->owner->pi_lock);
         WARN_ON(list_empty(&pi_state->list));
         list_del_init(&pi_state->list);
-        raw_spin_unlock_irq(&pi_state->owner->pi_lock);
+        raw_spin_unlock(&pi_state->owner->pi_lock);
 
-        raw_spin_lock_irq(&new_owner->pi_lock);
+        raw_spin_lock(&new_owner->pi_lock);
         WARN_ON(!list_empty(&pi_state->list));
         list_add(&pi_state->list, &new_owner->pi_state_list);
         pi_state->owner = new_owner;
-        raw_spin_unlock_irq(&new_owner->pi_lock);
+        raw_spin_unlock(&new_owner->pi_lock);
 
-        raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
+        raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
 
         deboost = rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q);
 
@@ -2127,11 +2127,11 @@ static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked)
                  * we returned due to timeout or signal without taking the
                  * rt_mutex. Too late.
                  */
-                raw_spin_lock(&q->pi_state->pi_mutex.wait_lock);
+                raw_spin_lock_irq(&q->pi_state->pi_mutex.wait_lock);
                 owner = rt_mutex_owner(&q->pi_state->pi_mutex);
                 if (!owner)
                         owner = rt_mutex_next_owner(&q->pi_state->pi_mutex);
-                raw_spin_unlock(&q->pi_state->pi_mutex.wait_lock);
+                raw_spin_unlock_irq(&q->pi_state->pi_mutex.wait_lock);
                 ret = fixup_pi_state_owner(uaddr, q, owner);
                 goto out;
         }