diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-18 23:48:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-18 23:48:36 -0800 |
| commit | b7193a89d188c177862b32ebad8b30fd40b864b5 (patch) | |
| tree | c3dcdda69786f472cf20a2d4d781d647181b6c4e | |
| parent | f116be368ef6eadd7401b4a38e9ff9c3644ff8f0 (diff) | |
| parent | f4f127a9ba71c5d6920c10609b076d41e408b369 (diff) | |
Merge "tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results"
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ae68222c5a74..1d0f1a1ac44c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1685,7 +1685,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, TRACE_FLAG_IRQS_NOSUPPORT | #endif ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) | - ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) | + ((pc & SOFTIRQ_OFFSET) ? TRACE_FLAG_SOFTIRQ : 0) | (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) | (test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0); } |