diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-04 00:21:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-04 00:21:55 -0800 |
| commit | 0b402f74a04ff7f09193c5c88cdf860498b93b5c (patch) | |
| tree | 20511a1c18d0c77e926af4415b15f1a7152a5b5e /kernel/locking | |
| parent | 8a475d4ba16373d30f8a57f8e2ee8f997dd00fbb (diff) | |
| parent | 0a858409d5cd7283b8720d989bd2dba3f9353a6c (diff) | |
Merge "Merge android-4.4.165 (f34ff9e) into msm-4.4"
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/lockdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 6e171b547a80..774ab79d3ec7 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -3826,7 +3826,7 @@ void lock_contended(struct lockdep_map *lock, unsigned long ip) { unsigned long flags; - if (unlikely(!lock_stat)) + if (unlikely(!lock_stat || !debug_locks)) return; if (unlikely(current->lockdep_recursion)) @@ -3846,7 +3846,7 @@ void lock_acquired(struct lockdep_map *lock, unsigned long ip) { unsigned long flags; - if (unlikely(!lock_stat)) + if (unlikely(!lock_stat || !debug_locks)) return; if (unlikely(current->lockdep_recursion)) |