diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-17 12:22:11 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-14 17:55:33 -0500 |
commit | d209d74d52ab39dc071656533cac095294f70de7 (patch) | |
tree | f48ae39908db89df7d93df79ac713318e026f0f7 /kernel/futex.c | |
parent | 1d615482547584b9a8bb6316a58fed6ce90dd9ff (diff) |
rtmutes: Convert rtmutex.lock to raw_spinlock
Convert locks which cannot be sleeping locks in preempt-rt to
raw_spinlocks.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 320b369d20b5..8e3c3ffe1b9a 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -760,7 +760,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) | |||
760 | if (!pi_state) | 760 | if (!pi_state) |
761 | return -EINVAL; | 761 | return -EINVAL; |
762 | 762 | ||
763 | spin_lock(&pi_state->pi_mutex.wait_lock); | 763 | raw_spin_lock(&pi_state->pi_mutex.wait_lock); |
764 | new_owner = rt_mutex_next_owner(&pi_state->pi_mutex); | 764 | new_owner = rt_mutex_next_owner(&pi_state->pi_mutex); |
765 | 765 | ||
766 | /* | 766 | /* |
@@ -789,7 +789,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) | |||
789 | else if (curval != uval) | 789 | else if (curval != uval) |
790 | ret = -EINVAL; | 790 | ret = -EINVAL; |
791 | if (ret) { | 791 | if (ret) { |
792 | spin_unlock(&pi_state->pi_mutex.wait_lock); | 792 | raw_spin_unlock(&pi_state->pi_mutex.wait_lock); |
793 | return ret; | 793 | return ret; |
794 | } | 794 | } |
795 | } | 795 | } |
@@ -805,7 +805,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) | |||
805 | pi_state->owner = new_owner; | 805 | pi_state->owner = new_owner; |
806 | raw_spin_unlock_irq(&new_owner->pi_lock); | 806 | raw_spin_unlock_irq(&new_owner->pi_lock); |
807 | 807 | ||
808 | spin_unlock(&pi_state->pi_mutex.wait_lock); | 808 | raw_spin_unlock(&pi_state->pi_mutex.wait_lock); |
809 | rt_mutex_unlock(&pi_state->pi_mutex); | 809 | rt_mutex_unlock(&pi_state->pi_mutex); |
810 | 810 | ||
811 | return 0; | 811 | return 0; |