diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-05 08:04:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-05 08:04:23 -0800 |
| commit | 078396ec4c69a680d32480766bb94bc8e93f99fd (patch) | |
| tree | ed5b7a040b67275dd123b8ba46d4793d4e9b6746 /kernel/locking | |
| parent | c4920ff327662e44bfa5a861bf4df980662fc51f (diff) | |
| parent | bc046dc1ddf4c3d8cb9687cdd4b769e26d4fb0c9 (diff) | |
Merge "Merge android-4.4-p.196 (736005d) into msm-4.4"
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/lockdep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index f2df5f86af28..a419696709a1 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -3314,6 +3314,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name, unsigned int depth; int i; + if (unlikely(!debug_locks)) + return 0; + depth = curr->lockdep_depth; /* * This function is about (re)setting the class of a held lock, |