projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
kernel
/
locking
/
mutex.c
diff --git
a/kernel/locking/mutex.c
b/kernel/locking/mutex.c
index
bc73d33
..
acca2c1
100644
(file)
--- a/
kernel/locking/mutex.c
+++ b/
kernel/locking/mutex.c
@@
-60,7
+60,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);