Commit 981e893e authored Mar 29, 2014 by Linus Torvalds

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

parents 0f2776e6 cab5e127

kernel/time/timekeeping.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1435,7 +1435,8 @@ void update_wall_time(void)
	out:		out:
	raw_spin_unlock_irqrestore(&timekeeper_lock, flags);		raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
	if (clock_set)		if (clock_set)
	clock_was_set();		/* Have to call _delayed version, since in irq context*/
			clock_was_set_delayed();
	}		}

	/**		/**