Skip to content

Commit 7879d10

Browse files
Ingo MolnarKAGA-KOKO
authored andcommitted
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 <mingo@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20250507175338.672442-4-mingo@kernel.org
1 parent e86e439 commit 7879d10

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

include/linux/timer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ void timer_init_key(struct timer_list *timer,
7272
const char *name, struct lock_class_key *key);
7373

7474
#ifdef CONFIG_DEBUG_OBJECTS_TIMERS
75-
extern void init_timer_on_stack_key(struct timer_list *timer,
75+
extern void timer_init_key_on_stack(struct timer_list *timer,
7676
void (*func)(struct timer_list *),
7777
unsigned int flags, const char *name,
7878
struct lock_class_key *key);
7979
#else
80-
static inline void init_timer_on_stack_key(struct timer_list *timer,
80+
static inline void timer_init_key_on_stack(struct timer_list *timer,
8181
void (*func)(struct timer_list *),
8282
unsigned int flags,
8383
const char *name,
@@ -97,14 +97,14 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
9797
#define __init_timer_on_stack(_timer, _fn, _flags) \
9898
do { \
9999
static struct lock_class_key __key; \
100-
init_timer_on_stack_key((_timer), (_fn), (_flags), \
100+
timer_init_key_on_stack((_timer), (_fn), (_flags), \
101101
#_timer, &__key); \
102102
} while (0)
103103
#else
104104
#define __init_timer(_timer, _fn, _flags) \
105105
timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
106106
#define __init_timer_on_stack(_timer, _fn, _flags) \
107-
init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
107+
timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)
108108
#endif
109109

110110
/**

kernel/time/timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,15 +850,15 @@ static void do_init_timer(struct timer_list *timer,
850850
unsigned int flags,
851851
const char *name, struct lock_class_key *key);
852852

853-
void init_timer_on_stack_key(struct timer_list *timer,
853+
void timer_init_key_on_stack(struct timer_list *timer,
854854
void (*func)(struct timer_list *),
855855
unsigned int flags,
856856
const char *name, struct lock_class_key *key)
857857
{
858858
debug_object_init_on_stack(timer, &timer_debug_descr);
859859
do_init_timer(timer, func, flags, name, key);
860860
}
861-
EXPORT_SYMBOL_GPL(init_timer_on_stack_key);
861+
EXPORT_SYMBOL_GPL(timer_init_key_on_stack);
862862

863863
void destroy_timer_on_stack(struct timer_list *timer)
864864
{

0 commit comments

Comments
 (0)