diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /arch/alpha/kernel/time.c | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/alpha/kernel/time.c')
| -rw-r--r-- | arch/alpha/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index b191cc759737..7c1e44420a78 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c | |||
| @@ -132,7 +132,7 @@ irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs) | |||
| 132 | nticks = delta >> FIX_SHIFT; | 132 | nticks = delta >> FIX_SHIFT; |
| 133 | 133 | ||
| 134 | while (nticks > 0) { | 134 | while (nticks > 0) { |
| 135 | do_timer(regs); | 135 | do_timer(1); |
| 136 | #ifndef CONFIG_SMP | 136 | #ifndef CONFIG_SMP |
| 137 | update_process_times(user_mode(regs)); | 137 | update_process_times(user_mode(regs)); |
| 138 | #endif | 138 | #endif |