Skip to content

Commit 244132c

Browse files
covanamIngo Molnar
authored andcommitted
tracing/timers: Rename the hrtimer_init event to hrtimer_setup
The function hrtimer_init() doesn't exist anymore. It was replaced by hrtimer_setup(). Thus, rename the hrtimer_init trace event to hrtimer_setup to keep it consistent. Signed-off-by: Nam Cao <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/all/cba84c3d853c5258aa3a262363a6eac08e2c7afc.1738746927.git.namcao@linutronix.de
1 parent 59c9eda commit 244132c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Documentation/trace/ftrace.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3077,7 +3077,7 @@ Notice that we lost the sys_nanosleep.
30773077
# cat set_ftrace_filter
30783078
hrtimer_run_queues
30793079
hrtimer_run_pending
3080-
hrtimer_init
3080+
hrtimer_setup
30813081
hrtimer_cancel
30823082
hrtimer_try_to_cancel
30833083
hrtimer_forward
@@ -3115,7 +3115,7 @@ Again, now we want to append.
31153115
# cat set_ftrace_filter
31163116
hrtimer_run_queues
31173117
hrtimer_run_pending
3118-
hrtimer_init
3118+
hrtimer_setup
31193119
hrtimer_cancel
31203120
hrtimer_try_to_cancel
31213121
hrtimer_forward

include/trace/events/timer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@ TRACE_EVENT(timer_base_idle,
185185
{ HRTIMER_MODE_REL_PINNED_HARD, "REL|PINNED|HARD" })
186186

187187
/**
188-
* hrtimer_init - called when the hrtimer is initialized
188+
* hrtimer_setup - called when the hrtimer is initialized
189189
* @hrtimer: pointer to struct hrtimer
190190
* @clockid: the hrtimers clock
191191
* @mode: the hrtimers mode
192192
*/
193-
TRACE_EVENT(hrtimer_init,
193+
TRACE_EVENT(hrtimer_setup,
194194

195195
TP_PROTO(struct hrtimer *hrtimer, clockid_t clockid,
196196
enum hrtimer_mode mode),

kernel/time/hrtimer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,14 @@ static inline void debug_hrtimer_deactivate(struct hrtimer *timer) { }
468468
static inline void debug_setup(struct hrtimer *timer, clockid_t clockid, enum hrtimer_mode mode)
469469
{
470470
debug_hrtimer_init(timer);
471-
trace_hrtimer_init(timer, clockid, mode);
471+
trace_hrtimer_setup(timer, clockid, mode);
472472
}
473473

474474
static inline void debug_setup_on_stack(struct hrtimer *timer, clockid_t clockid,
475475
enum hrtimer_mode mode)
476476
{
477477
debug_hrtimer_init_on_stack(timer);
478-
trace_hrtimer_init(timer, clockid, mode);
478+
trace_hrtimer_setup(timer, clockid, mode);
479479
}
480480

481481
static inline void debug_activate(struct hrtimer *timer,

tools/perf/tests/shell/trace_btf_enum.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ err=0
66
set -e
77

88
syscall="landlock_add_rule"
9-
non_syscall="timer:hrtimer_init,timer:hrtimer_start"
9+
non_syscall="timer:hrtimer_setup,timer:hrtimer_start"
1010

1111
TESTPROG="perf test -w landlock"
1212

0 commit comments

Comments
 (0)