diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 19:09:38 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 19:09:38 (GMT) |
commit | 99ee12973e5fd1123ed1779fb4d11ac7d381d430 (patch) | |
tree | 6786f9feaf02a979fbcd7943e3ad9bb901133383 | |
parent | bcb16568275a9bfaa79efdce6816467927f2c406 (diff) | |
parent | 74a03b69d1b5ce00a568e142ca97e76b7f5239c6 (diff) | |
download | linux-fsl-qoriq-99ee12973e5fd1123ed1779fb4d11ac7d381d430.tar.xz |
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()
-rw-r--r-- | kernel/time/tick-common.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 21a5ca8..83c4417 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -93,7 +93,17 @@ void tick_handle_periodic(struct clock_event_device *dev) for (;;) { if (!clockevents_program_event(dev, next, ktime_get())) return; - tick_periodic(cpu); + /* + * 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); } } |