projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/intel8x0' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
debug_locks.h
diff --git
a/include/linux/debug_locks.h
b/include/linux/debug_locks.h
index 4aaa4afb1cb99f849bb345a8189153e65e94cbcd..096476f1fb356a2c17ab5d267be9a2295f55295a 100644
(file)
--- a/
include/linux/debug_locks.h
+++ b/
include/linux/debug_locks.h
@@
-17,7
+17,7
@@
extern int debug_locks_off(void);
({ \
int __ret = 0; \
\
- if (
unlikely(c)) {
\
+ if (
!oops_in_progress && unlikely(c)) {
\
if (debug_locks_off() && !debug_locks_silent) \
WARN_ON(1); \
__ret = 1; \