diff options
| author | Ingo Molnar | 2014-07-17 11:45:29 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2014-07-17 11:45:29 +0200 |
| commit | b5e4111f027c4be85dbe97e090530d03c55c4cf4 (patch) | |
| tree | 11e0a37cb59314f4e9a7b2810124a4a7a33140e5 /kernel/locking/mutex.c | |
| parent | locking/mutexes: Optimize mutex trylock slowpath (diff) | |
| parent | Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | kernel-qcow2-linux-b5e4111f027c4be85dbe97e090530d03c55c4cf4.tar.gz kernel-qcow2-linux-b5e4111f027c4be85dbe97e090530d03c55c4cf4.tar.xz kernel-qcow2-linux-b5e4111f027c4be85dbe97e090530d03c55c4cf4.zip | |
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) INIT_LIST_HEAD(&lock->wait_list); mutex_clear_owner(lock); #ifdef CONFIG_MUTEX_SPIN_ON_OWNER - lock->osq = NULL; + osq_lock_init(&lock->osq); #endif debug_mutex_init(lock, name, key); |