diff options
Diffstat (limited to 'kernel/locking/spinlock_debug.c')
| -rw-r--r-- | kernel/locking/spinlock_debug.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/locking/spinlock_debug.c b/kernel/locking/spinlock_debug.c index 472dd462a40c..b9d93087ee66 100644 --- a/kernel/locking/spinlock_debug.c +++ b/kernel/locking/spinlock_debug.c @@ -14,14 +14,14 @@  #include <linux/export.h>  void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name, -			  struct lock_class_key *key) +			  struct lock_class_key *key, short inner)  {  #ifdef CONFIG_DEBUG_LOCK_ALLOC  	/*  	 * Make sure we are not reinitializing a held lock:  	 */  	debug_check_no_locks_freed((void *)lock, sizeof(*lock)); -	lockdep_init_map(&lock->dep_map, name, key, 0); +	lockdep_init_map_wait(&lock->dep_map, name, key, 0, inner);  #endif  	lock->raw_lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;  	lock->magic = SPINLOCK_MAGIC; @@ -39,7 +39,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,  	 * Make sure we are not reinitializing a held lock:  	 */  	debug_check_no_locks_freed((void *)lock, sizeof(*lock)); -	lockdep_init_map(&lock->dep_map, name, key, 0); +	lockdep_init_map_wait(&lock->dep_map, name, key, 0, LD_WAIT_CONFIG);  #endif  	lock->raw_lock = (arch_rwlock_t) __ARCH_RW_LOCK_UNLOCKED;  	lock->magic = RWLOCK_MAGIC;  |