diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-24 20:36:45 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-24 20:36:44 -0800 |
| commit | 41a986188bbbcf499a69546e7e54b507b9888d26 (patch) | |
| tree | 901cc82d6a4526f4409f54f9f2503d55e52868a6 /kernel/locking | |
| parent | 963910a5efbd371ef0c995b72303b6220d504a52 (diff) | |
| parent | 8c8abdeafc8ce93c811773ba7d177d27015702aa (diff) | |
Merge "Merge android-4.4.112 (5f6325b) into msm-4.4"
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/mutex.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index bf5277ee11d3..c61c56f05dfa 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -731,6 +731,7 @@ static inline void __mutex_unlock_common_slowpath(struct mutex *lock, int nested) { unsigned long flags; + WAKE_Q(wake_q); /* * As a performance measurement, release the lock before doing other @@ -758,11 +759,11 @@ __mutex_unlock_common_slowpath(struct mutex *lock, int nested) struct mutex_waiter, list); debug_mutex_wake_waiter(lock, waiter); - - wake_up_process(waiter->task); + wake_q_add(&wake_q, waiter->task); } spin_unlock_mutex(&lock->wait_lock, flags); + wake_up_q(&wake_q); } /* |