leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6

Browse Source 
* 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.
This commit is contained in:
Linus Torvalds 2007-02-26 11:42:10 -08:00
commit 5313a20bfc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/time/tick-common.c
View File

@ -77,6 +77,7 @@ static void tick_periodic(int cpu)
void tick_handle_periodic(struct clock_event_device *dev) void tick_handle_periodic(struct clock_event_device *dev)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
ktime_t next;
tick_periodic(cpu); 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 * Setup the next period for devices, which do not have
* periodic mode: * periodic mode:
*/ */
next = ktime_add(dev->next_event, tick_period);
for (;;) { for (;;) {
ktime_t next = ktime_add(dev->next_event, tick_period);
if (!clockevents_program_event(dev, next, ktime_get())) if (!clockevents_program_event(dev, next, ktime_get()))
return; return;
tick_periodic(cpu); tick_periodic(cpu);
next = ktime_add(next, tick_period);
} }
} }

2
kernel/time/tick-sched.c
View File

@ -21,6 +21,8 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/tick.h> #include <linux/tick.h>
#include <asm/irq_regs.h>
#include "tick-internal.h" #include "tick-internal.h"
/* /*