Skip to content
/ linux Public

Commit 7111701

Browse files
KAGA-KOKOSasha Levin
authored andcommitted
hrtimer: Fix trace oddity
[ Upstream commit 5d6446f ] It turns out that __run_hrtimer() will trace like: <idle>-0 [032] d.h2. 20705.474563: hrtimer_cancel: hrtimer=0xff2db8f77f8226e8 <idle>-0 [032] d.h1. 20705.474563: hrtimer_expire_entry: hrtimer=0xff2db8f77f8226e8 now=20699452001850 function=tick_nohz_handler/0x0 Which is a bit nonsensical, the timer doesn't get canceled on expiration. The cause is the use of the incorrect debug helper. Fixes: c6a2a17 ("hrtimer: Add tracepoint for hrtimers") Reported-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://patch.msgid.link/20260121143208.219595606@infradead.org Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 33a30bf commit 7111701

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/time/hrtimer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
17151715

17161716
lockdep_assert_held(&cpu_base->lock);
17171717

1718-
debug_deactivate(timer);
1718+
debug_hrtimer_deactivate(timer);
17191719
base->running = timer;
17201720

17211721
/*

0 commit comments

Comments
 (0)