Skip to content

Commit

Permalink
tracing, preempt: Squash _rcuidle tracing
Browse files Browse the repository at this point in the history
Extend commit 9aedeae ("tracing, hardirq: No moar _rcuidle()
tracing") to also cover trace_preempt_{on,off}() which were
mysteriously untouched.

Fixes: 9aedeae ("tracing, hardirq: No moar _rcuidle() tracing")
Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lkml.kernel.org/r/Y9D5AfnOukWNOZ5q@hirez.programming.kicks-ass.net
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
  • Loading branch information
Peter Zijlstra authored and paulmckrcu committed Jan 28, 2023
1 parent da9953a commit 29847e5
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions kernel/trace/trace_preemptirq.c
Expand Up @@ -119,15 +119,13 @@ NOKPROBE_SYMBOL(trace_hardirqs_off_caller);

void trace_preempt_on(unsigned long a0, unsigned long a1)
{
if (!in_nmi())
trace_preempt_enable_rcuidle(a0, a1);
trace(preempt_enable)(a0, a1);
tracer_preempt_on(a0, a1);
}

void trace_preempt_off(unsigned long a0, unsigned long a1)
{
if (!in_nmi())
trace_preempt_disable_rcuidle(a0, a1);
trace(preempt_disable)(a0, a1);
tracer_preempt_off(a0, a1);
}
#endif

0 comments on commit 29847e5

Please sign in to comment.