Commit 99ee1297 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'timers/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clockevents: prevent endless loop in tick_handle_periodic()
parents bcb16568 74a03b69

kernel/time/tick-common.c

+11 −1
Original line number Diff line number Diff line
@@ -93,6 +93,16 @@ void tick_handle_periodic(struct clock_event_device *dev) 
	for (;;) {

		if (!clockevents_program_event(dev, next, ktime_get()))

			return;

		/*

		 * Have to be careful here. If we're in oneshot mode,

		 * before we call tick_periodic() in a loop, we need

		 * to be sure we're using a real hardware clocksource.

		 * Otherwise we could get trapped in an infinite

		 * loop, as the tick_periodic() increments jiffies,

		 * when then will increment time, posibly causing

		 * the loop to trigger again and again.

		 */

		if (timekeeping_valid_for_hres())

			tick_periodic(cpu);

		next = ktime_add(next, tick_period);

	}