aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-11-01 11:13:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-11-01 11:13:45 -0800
commit4312e0e8d3eab027d9506db091eb10e6a9ff25d3 (patch)
treec3d14403f5d9bae1040c97e22fb23d0438a9915c /kernel/time/timer.c
parent82423b46fc9ec699a0ede9e025a8414658cdcf48 (diff)
parentcb47755725da7b90fecbb2aa82ac3b24a7adb89b (diff)
downloadlinux-4312e0e8d3eab027d9506db091eb10e6a9ff25d3.tar.gz
Merge tag 'timers-urgent-2020-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: "A few fixes for timers/timekeeping: - Prevent undefined behaviour in the timespec64_to_ns() conversion which is used for converting user supplied time input to nanoseconds. It lacked overflow protection. - Mark sched_clock_read_begin/retry() to prevent recursion in the tracer - Remove unused debug functions in the hrtimer and timerlist code" * tag 'timers-urgent-2020-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: time: Prevent undefined behaviour in timespec64_to_ns() timers: Remove unused inline funtion debug_timer_free() hrtimer: Remove unused inline function debug_hrtimer_free() time/sched_clock: Mark sched_clock_read_begin/retry() as notrace
Diffstat (limited to 'kernel/time/timer.c')
-rw-r--r--kernel/time/timer.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index de37e33a868d..c3ad64fb9d8b 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -732,11 +732,6 @@ static inline void debug_timer_deactivate(struct timer_list *timer)
debug_object_deactivate(timer, &timer_debug_descr);
}
-static inline void debug_timer_free(struct timer_list *timer)
-{
- debug_object_free(timer, &timer_debug_descr);
-}
-
static inline void debug_timer_assert_init(struct timer_list *timer)
{
debug_object_assert_init(timer, &timer_debug_descr);