Commit dd43f346 authored Jan 17, 2018 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A one-liner fix which prevents deferrable timers becoming stale when
  the system does not switch into NOHZ mode"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers: Unconditionally check deferrable base

parents 8cbab92d ed4bbf79

kernel/time/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1696,7 +1696,7 @@ void run_local_timers(void)
		hrtimer_run_queues();
		/* Raise the softirq only if required. */
		if (time_before(jiffies, base->clk)) {
		if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) \|\| !base->nohz_active)
		if (!IS_ENABLED(CONFIG_NO_HZ_COMMON))
		return;
		/* CPU is awake, so check the deferrable base. */
		base++;