diff options
| author |   Tony Lindgren <tony@atomide.com> | 2020-04-21 09:36:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-04-21 09:36:03 -0700 |
| commit | 175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3 (patch) | |
| tree | c7fd682de61e3c2a6cc3ba0e8881b99fafdf969c /kernel/locking/mutex-debug.c | |
| parent | ARM: dts: OMAP3: disable RNG on N950/N9 (diff) | |
| parent | ARM: dts: dra7: Fix bus_dma_limit for PCIe (diff) | |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'kernel/locking/mutex-debug.c')
| -rw-r--r-- | kernel/locking/mutex-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c index 771d4ca96dda..a7276aaf2abc 100644 --- a/kernel/locking/mutex-debug.c +++ b/kernel/locking/mutex-debug.c @@ -85,7 +85,7 @@ void debug_mutex_init(struct mutex *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_SLEEP); #endif lock->magic = lock; } |