diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:42:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:42:10 -0800 |
| commit | 5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6 (patch) | |
| tree | c45ee8d353a21a0a98d78cf838340c928317134d /kernel | |
| parent | a7538a7f87826fb5cacc6959f00dfa9fba6f4b15 (diff) | |
| parent | 3494c16676a21e7e53e21b08a0a469a38df6dcfb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6:
[TICK] tick-common: Fix one-shot handling in tick_handle_periodic().
[TIME] tick-sched: Add missing asm/irq_regs.h include.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/tick-common.c | 5 | ||||
| -rw-r--r-- | kernel/time/tick-sched.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 4500e347f1bb..0986a2bfab49 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -77,6 +77,7 @@ static void tick_periodic(int cpu) void tick_handle_periodic(struct clock_event_device *dev) { int cpu = smp_processor_id(); + ktime_t next; tick_periodic(cpu); @@ -86,12 +87,12 @@ void tick_handle_periodic(struct clock_event_device *dev) * Setup the next period for devices, which do not have * periodic mode: */ + next = ktime_add(dev->next_event, tick_period); for (;;) { - ktime_t next = ktime_add(dev->next_event, tick_period); - if (!clockevents_program_event(dev, next, ktime_get())) return; tick_periodic(cpu); + next = ktime_add(next, tick_period); } } diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 512a4a906467..51556b95f60f 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -21,6 +21,8 @@ #include <linux/sched.h> #include <linux/tick.h> +#include <asm/irq_regs.h> + #include "tick-internal.h" /* |