tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 981e893e 0f2776e6

+2 -1
+2 -1
kernel/time/timekeeping.c
··· 1435 1435 out: 1436 1436 raw_spin_unlock_irqrestore(&timekeeper_lock, flags); 1437 1437 if (clock_set) 1438 - clock_was_set(); 1438 + /* Have to call _delayed version, since in irq context*/ 1439 + clock_was_set_delayed(); 1439 1440 } 1440 1441 1441 1442 /**