diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-07-17 05:45:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-07-17 05:45:29 -0400 |
commit | b5e4111f027c4be85dbe97e090530d03c55c4cf4 (patch) | |
tree | 11e0a37cb59314f4e9a7b2810124a4a7a33140e5 /kernel/locking/mutex.c | |
parent | 72d5305dcb3637913c2c37e847a4de9028e49244 (diff) | |
parent | 9de8033f1bbcce5ed23fe5da9ca1a5060207f7ed (diff) |
Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/mutex.c')
-rw-r--r-- | kernel/locking/mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 11b103d87b27..d3100521388c 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c | |||
@@ -54,7 +54,7 @@ __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key) | |||
54 | INIT_LIST_HEAD(&lock->wait_list); | 54 | INIT_LIST_HEAD(&lock->wait_list); |
55 | mutex_clear_owner(lock); | 55 | mutex_clear_owner(lock); |
56 | #ifdef CONFIG_MUTEX_SPIN_ON_OWNER | 56 | #ifdef CONFIG_MUTEX_SPIN_ON_OWNER |
57 | lock->osq = NULL; | 57 | osq_lock_init(&lock->osq); |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | debug_mutex_init(lock, name, key); | 60 | debug_mutex_init(lock, name, key); |