diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /arch/cris | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index 9c22b76e12..ebacf1457d 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c | |||
| @@ -227,7 +227,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 227 | 227 | ||
| 228 | /* call the real timer interrupt handler */ | 228 | /* call the real timer interrupt handler */ |
| 229 | 229 | ||
| 230 | do_timer(regs); | 230 | do_timer(1); |
| 231 | 231 | ||
| 232 | cris_do_profile(regs); /* Save profiling information */ | 232 | cris_do_profile(regs); /* Save profiling information */ |
| 233 | 233 | ||
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index 50f3f93293..be0a01657d 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c | |||
| @@ -219,7 +219,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 219 | return IRQ_HANDLED; | 219 | return IRQ_HANDLED; |
| 220 | 220 | ||
| 221 | /* call the real timer interrupt handler */ | 221 | /* call the real timer interrupt handler */ |
| 222 | do_timer(regs); | 222 | do_timer(1); |
| 223 | 223 | ||
| 224 | /* | 224 | /* |
| 225 | * If we have an externally synchronized Linux clock, then update | 225 | * If we have an externally synchronized Linux clock, then update |