diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-09-05 12:17:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-09-05 12:17:43 +0300 |
| commit | 95c13662b65c562d4902ad9f810378261347a749 (patch) | |
| tree | 036091f8615fdf2d00021709993b00790a630250 /kernel/locking/lockdep.c | |
| parent | fe826cc2654e8561b64246325e6a51b62bf2488c (diff) | |
| parent | 2ab9d830262c132ab5db2f571003d80850d56b2a (diff) | |
| download | linux-95c13662b65c562d4902ad9f810378261347a749.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
This also refreshes the -rc1 based branch to -rc5.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/lockdep.c')
| -rw-r--r-- | kernel/locking/lockdep.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 58c88220a478..0349f957e672 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -5936,6 +5936,9 @@ __lock_contended(struct lockdep_map *lock, unsigned long ip) if (DEBUG_LOCKS_WARN_ON(!depth)) return; + if (unlikely(lock->key == &__lockdep_no_track__)) + return; + hlock = find_held_lock(curr, lock, depth, &i); if (!hlock) { print_lock_contention_bug(curr, lock, ip); @@ -5978,6 +5981,9 @@ __lock_acquired(struct lockdep_map *lock, unsigned long ip) if (DEBUG_LOCKS_WARN_ON(!depth)) return; + if (unlikely(lock->key == &__lockdep_no_track__)) + return; + hlock = find_held_lock(curr, lock, depth, &i); if (!hlock) { print_lock_contention_bug(curr, lock, _RET_IP_); |