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

981e893e · Linus Torvalds <[email protected]> · 2014-03-29 15:01:09 -07:00

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

Commit: 981e893ed537cbaa08f8089d480db4165e6d71c0
Parents: 0f2776e6 · cab5e127

Merge commit. Changes below are compared with the first parent: 0f2776e6.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
kernel/time/timekeeping.c	modified	+2	−1	View file

kernel/time/timekeeping.c

View file

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 0aa4ce8..5b40279 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1435,7 +1435,8 @@ void update_wall_time(void)
 out:
 	raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
 	if (clock_set)
-		clock_was_set();
+		/* Have to call _delayed version, since in irq context*/
+		clock_was_set_delayed();
 }
 
 /**