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

Linus Torvalds committed 8 years ago

Commit dd43f342 parents 8cbab92 ed4bbf71 file · +1 −1Browse files

Unified · Split

kernel/time/timer.c+1−1

@@ -1696,7 +1696,7 @@ void run_local_timers(void) · 1695 unmodified lines
1696	hrtimer_run_queues();	1696	hrtimer_run_queues();
1697	/* Raise the softirq only if required. */	1697	/* Raise the softirq only if required. */
1698	if (time_before(jiffies, base->clk)) {	1698	if (time_before(jiffies, base->clk)) {
1699	if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) \|\| !base->nohz_active)	1699	if (!IS_ENABLED(CONFIG_NO_HZ_COMMON))
1700	return;	1700	return;
1701	/* CPU is awake, so check the deferrable base. */	1701	/* CPU is awake, so check the deferrable base. */
1702	base++;	1702	base++;