hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-01-17 11:43:42 -08:00
parent 8cbab92dff ed4bbf7910
commit dd43f3465d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/time/timer.c
View File

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