diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-12-18 13:19:19 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-12-18 13:19:19 +0100 |
| commit | e7dc055a10416e0c6eabd518d6ed89da38eca0f1 (patch) | |
| tree | 412664aee3b31db9dd4fc174b0b0200573b92090 | |
| parent | a903a401dd63bbe9c6af053c211e112118083c66 (diff) | |
| download | linux-rt-devel-e7dc055a10416e0c6eabd518d6ed89da38eca0f1.tar.gz | |
tracing: Merge irqflags + preemt counter, add RT bits (update)
Add a file to the original patch which was overlooked.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| -rw-r--r-- | kernel/trace/trace_branch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index eff099123aa27..0de1e9c4d381b 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -37,7 +37,7 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect) struct ring_buffer_event *event; struct trace_branch *entry; unsigned long flags; - int pc; + unsigned int pc; const char *p; if (current->trace_recursion & TRACE_BRANCH_BIT) @@ -59,10 +59,10 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect) if (atomic_read(&data->disabled)) goto out; - pc = preempt_count(); + trace_ctx = _tracing_gen_ctx_flags(flags); buffer = tr->array_buffer.buffer; event = trace_buffer_lock_reserve(buffer, TRACE_BRANCH, - sizeof(*entry), flags, pc); + sizeof(*entry), trace_ctx); if (!event) goto out; |