diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-05-07 19:53:37 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2025-05-08 19:49:33 +0200 |
| commit | aad823aa3a7d675a8d0de478a04307f63e3725db (patch) | |
| tree | 87aa83dc40f0486dff45e5d97237a4bdccdbb715 /kernel | |
| parent | treewide, timers: Rename try_to_del_timer_sync() as timer_delete_sync_try() (diff) | |
| download | wireguard-linux-aad823aa3a7d675a8d0de478a04307f63e3725db.tar.xz wireguard-linux-aad823aa3a7d675a8d0de478a04307f63e3725db.zip | |
treewide, timers: Rename destroy_timer_on_stack() as timer_destroy_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-10-mingo@kernel.org
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kcsan/kcsan_test.c | 2 | ||||
| -rw-r--r-- | kernel/rcu/rcutorture.c | 2 | ||||
| -rw-r--r-- | kernel/time/sleep_timeout.c | 2 | ||||
| -rw-r--r-- | kernel/time/timer.c | 4 | ||||
| -rw-r--r-- | kernel/workqueue.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c index 6ce73cceaf53..c2871180edcc 100644 --- a/kernel/kcsan/kcsan_test.c +++ b/kernel/kcsan/kcsan_test.c @@ -1501,7 +1501,7 @@ static int access_thread(void *arg) } } while (!torture_must_stop()); timer_delete_sync(&timer); - destroy_timer_on_stack(&timer); + timer_destroy_on_stack(&timer); torture_kthread_stopping("access_thread"); return 0; diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 4fa7772be183..f3f1bc86fbea 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -2325,7 +2325,7 @@ rcu_torture_reader(void *arg) } while (!torture_must_stop()); if (irqreader && cur_ops->irq_capable) { timer_delete_sync(&t); - destroy_timer_on_stack(&t); + timer_destroy_on_stack(&t); } tick_dep_clear_task(current, TICK_DEP_BIT_RCU); torture_kthread_stopping("rcu_torture_reader"); diff --git a/kernel/time/sleep_timeout.c b/kernel/time/sleep_timeout.c index c0e960a5de39..5aa38b2cf40a 100644 --- a/kernel/time/sleep_timeout.c +++ b/kernel/time/sleep_timeout.c @@ -100,7 +100,7 @@ signed long __sched schedule_timeout(signed long timeout) timer_delete_sync(&timer.timer); /* Remove the timer from the object tracker */ - destroy_timer_on_stack(&timer.timer); + timer_destroy_on_stack(&timer.timer); timeout = expire - jiffies; diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 836ba00690bb..007b30fc383b 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -860,11 +860,11 @@ void timer_init_key_on_stack(struct timer_list *timer, } EXPORT_SYMBOL_GPL(timer_init_key_on_stack); -void destroy_timer_on_stack(struct timer_list *timer) +void timer_destroy_on_stack(struct timer_list *timer) { debug_object_free(timer, &timer_debug_descr); } -EXPORT_SYMBOL_GPL(destroy_timer_on_stack); +EXPORT_SYMBOL_GPL(timer_destroy_on_stack); #else static inline void debug_timer_init(struct timer_list *timer) { } diff --git a/kernel/workqueue.c b/kernel/workqueue.c index cf6203282737..9e6cf45f0972 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -686,7 +686,7 @@ EXPORT_SYMBOL_GPL(destroy_work_on_stack); void destroy_delayed_work_on_stack(struct delayed_work *work) { - destroy_timer_on_stack(&work->timer); + timer_destroy_on_stack(&work->timer); debug_object_free(&work->work, &work_debug_descr); } EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack); |