Skip to content

Commit 981e893

Browse files
committed
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar: "A late breaking fix from John. (The bug fixed has a hard lockup potential, but that was not observed, warnings were)" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: time: Revert to calling clock_was_set_delayed() while in irq context
2 parents 0f2776e + cab5e12 commit 981e893

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

kernel/time/timekeeping.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,8 @@ void update_wall_time(void)
14351435
out:
14361436
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
14371437
if (clock_set)
1438-
clock_was_set();
1438+
/* Have to call _delayed version, since in irq context*/
1439+
clock_was_set_delayed();
14391440
}
14401441

14411442
/**

0 commit comments

Comments
 (0)