projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/rt5640', 'asoc/topic/rt5659', 'asoc/topic...
[cascardo/linux.git]
/
arch
/
s390
/
kernel
/
trace.c
diff --git
a/arch/s390/kernel/trace.c
b/arch/s390/kernel/trace.c
index
21a5df9
..
dde7654
100644
(file)
--- a/
arch/s390/kernel/trace.c
+++ b/
arch/s390/kernel/trace.c
@@
-18,6
+18,9
@@
void trace_s390_diagnose_norecursion(int diag_nr)
unsigned long flags;
unsigned int *depth;
+ /* Avoid lockdep recursion. */
+ if (IS_ENABLED(CONFIG_LOCKDEP))
+ return;
local_irq_save(flags);
depth = this_cpu_ptr(&diagnose_trace_depth);
if (*depth == 0) {