diff options
| author | Mark Brown <broonie@kernel.org> | 2018-11-22 15:19:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-22 15:19:34 +0000 |
| commit | 375fef4f04334199a0759ad7ac2572060122a189 (patch) | |
| tree | 40635b03cc2adac51f172674f94e3648be9a010a /lib | |
| parent | e0745aa91bc7245b58210949d39e1b0d0bf483f4 (diff) | |
| parent | 8e592f4a26addb5d2008548787fbe3c9cc960fd5 (diff) | |
Merge tag 'v4.4.164' into linux-linaro-lsk-v4.4
This is the 4.4.164 stable release
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/debug_locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/debug_locks.c b/lib/debug_locks.c index 96c4c633d95e..124fdf238b3d 100644 --- a/lib/debug_locks.c +++ b/lib/debug_locks.c @@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(debug_locks_silent); */ int debug_locks_off(void) { - if (__debug_locks_off()) { + if (debug_locks && __debug_locks_off()) { if (!debug_locks_silent) { console_verbose(); return 1; |