From: Ingo Molnar Date: Wed, 7 May 2025 17:53:31 +0000 (+0200) Subject: timers: Rename init_timer_on_stack_key() as timer_init_key_on_stack() X-Git-Tag: v6.16-rc1~185^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7879d10de3318af0b7893d1efc9d7654cd4ac1a6;p=thirdparty%2Fkernel%2Flinux.git timers: Rename init_timer_on_stack_key() as timer_init_key_on_stack() Move this API to the canonical timer_*() namespace. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20250507175338.672442-4-mingo@kernel.org --- diff --git a/include/linux/timer.h b/include/linux/timer.h index 0c1c3aa723e5b..31127e8de010d 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -72,12 +72,12 @@ void timer_init_key(struct timer_list *timer, const char *name, struct lock_class_key *key); #ifdef CONFIG_DEBUG_OBJECTS_TIMERS -extern void init_timer_on_stack_key(struct timer_list *timer, +extern void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name, struct lock_class_key *key); #else -static inline void init_timer_on_stack_key(struct timer_list *timer, +static inline void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name, @@ -97,14 +97,14 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, #define __init_timer_on_stack(_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ - init_timer_on_stack_key((_timer), (_fn), (_flags), \ + timer_init_key_on_stack((_timer), (_fn), (_flags), \ #_timer, &__key); \ } while (0) #else #define __init_timer(_timer, _fn, _flags) \ timer_init_key((_timer), (_fn), (_flags), NULL, NULL) #define __init_timer_on_stack(_timer, _fn, _flags) \ - init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL) + timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL) #endif /** diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 5efed361409c8..6f520e5f548b6 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -850,7 +850,7 @@ static void do_init_timer(struct timer_list *timer, unsigned int flags, const char *name, struct lock_class_key *key); -void init_timer_on_stack_key(struct timer_list *timer, +void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name, struct lock_class_key *key) @@ -858,7 +858,7 @@ void init_timer_on_stack_key(struct timer_list *timer, debug_object_init_on_stack(timer, &timer_debug_descr); do_init_timer(timer, func, flags, name, key); } -EXPORT_SYMBOL_GPL(init_timer_on_stack_key); +EXPORT_SYMBOL_GPL(timer_init_key_on_stack); void destroy_timer_on_stack(struct timer_list *timer) {