diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:14:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:14:57 +0100 |
| commit | 9884afa2fdce71cd35bb79303f9050f0d76e3d03 (patch) | |
| tree | e4bd1187eee271fd93b8a99c5a951afaa53c4d80 /kernel/locking | |
| parent | fbfcd0199170984bd3c2812e49ed0fe7b226959a (diff) | |
| parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
| download | linux-0-day-9884afa2fdce71cd35bb79303f9050f0d76e3d03.tar.gz linux-0-day-9884afa2fdce71cd35bb79303f9050f0d76e3d03.tar.xz | |
Merge tag 'v4.16-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/rtmutex.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 65cc0cb984e6a..940633c632541 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1616,11 +1616,12 @@ bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock, void __sched rt_mutex_futex_unlock(struct rt_mutex *lock) { DEFINE_WAKE_Q(wake_q); + unsigned long flags; bool postunlock; - raw_spin_lock_irq(&lock->wait_lock); + raw_spin_lock_irqsave(&lock->wait_lock, flags); postunlock = __rt_mutex_futex_unlock(lock, &wake_q); - raw_spin_unlock_irq(&lock->wait_lock); + raw_spin_unlock_irqrestore(&lock->wait_lock, flags); if (postunlock) rt_mutex_postunlock(&wake_q); |