Commit 7879d10d authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

timers: Rename init_timer_on_stack_key() as timer_init_key_on_stack() 



Move this API to the canonical timer_*() namespace.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-4-mingo@kernel.org
parent e86e4390

include/linux/timer.h

+4 −4
Original line number Diff line number Diff line
@@ -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



/**

kernel/time/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{