Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
kernel
/
trace
/
trace_irqsoff.c
diff --git
a/kernel/kernel/trace/trace_irqsoff.c
b/kernel/kernel/trace/trace_irqsoff.c
index
069942c
..
553e712
100644
(file)
--- a/
kernel/kernel/trace/trace_irqsoff.c
+++ b/
kernel/kernel/trace/trace_irqsoff.c
@@
-110,8
+110,12
@@
static int func_prolog_dec(struct trace_array *tr,
return 0;
local_save_flags(*flags);
return 0;
local_save_flags(*flags);
- /* slight chance to get a false positive on tracing_cpu */
- if (!irqs_disabled_flags(*flags))
+ /*
+ * Slight chance to get a false positive on tracing_cpu,
+ * although I'm starting to think there isn't a chance.
+ * Leave this for now just to be paranoid.
+ */
+ if (!irqs_disabled_flags(*flags) && !preempt_count())
return 0;
*data = per_cpu_ptr(tr->trace_buffer.data, cpu);
return 0;
*data = per_cpu_ptr(tr->trace_buffer.data, cpu);