Commit 03c8b0bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers_urgent_for_v6.10_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Borislav Petkov:

 - Warn when an hrtimer doesn't get a callback supplied

* tag 'timers_urgent_for_v6.10_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hrtimer: Prevent queuing of hrtimer without a function callback
parents 327fceff 5a830bbc

kernel/time/hrtimer.c

+2 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,8 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, 
	struct hrtimer_clock_base *base;

	unsigned long flags;



	if (WARN_ON_ONCE(!timer->function))

		return;

	/*

	 * Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft

	 * match on CONFIG_PREEMPT_RT = n. With PREEMPT_RT check the hard