diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2022-11-23 21:18:37 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2022-11-24 15:09:10 +0100 |
| commit | 9a5a305686971f4be10c6d7251c8348d74b3e014 (patch) | |
| tree | 92f42887a399d5728b85adf2505c54f0762e7ec1 /kernel/time | |
| parent | 6e1fc2591f116dfb20b65cf27356475461d61bd8 (diff) | |
| download | linux-stable-9a5a305686971f4be10c6d7251c8348d74b3e014.tar.gz linux-stable-9a5a305686971f4be10c6d7251c8348d74b3e014.tar.bz2 linux-stable-9a5a305686971f4be10c6d7251c8348d74b3e014.zip | |
timers: Get rid of del_singleshot_timer_sync()
del_singleshot_timer_sync() used to be an optimization for deleting timers
which are not rearmed from the timer callback function.
This optimization turned out to be broken and got mapped to
del_timer_sync() about 17 years ago.
Get rid of the undocumented indirection and use del_timer_sync() directly.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201624.706987932@linutronix.de
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index f40c88c156fe..190e06980d87 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1933,7 +1933,7 @@ signed long __sched schedule_timeout(signed long timeout) timer_setup_on_stack(&timer.timer, process_timeout, 0); __mod_timer(&timer.timer, expire, MOD_TIMER_NOTPENDING); schedule(); - del_singleshot_timer_sync(&timer.timer); + del_timer_sync(&timer.timer); /* Remove the timer from the object tracker */ destroy_timer_on_stack(&timer.timer); |