diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 23:12:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 23:12:11 -0400 |
| commit | ada26d41e9ee1da31d11957b4452f4227a292e10 (patch) | |
| tree | dfaf212edd5f6d1b749226cdd35c706cdc0f3c14 /arch/parisc/kernel/time.c | |
| parent | d150ad7bd946f066c98a9725685109dcffae0cba (diff) | |
| parent | be577a5220b25e0a6e3fbf96bbfc8b31d63e9ea9 (diff) | |
Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6
* 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6:
Build fixes for struct pt_regs removal
Diffstat (limited to 'arch/parisc/kernel/time.c')
| -rw-r--r-- | arch/parisc/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 1d58ce0e37ad..b44839203e69 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c | |||
| @@ -66,7 +66,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 66 | /* gcc can optimize for "read-only" case with a local clocktick */ | 66 | /* gcc can optimize for "read-only" case with a local clocktick */ |
| 67 | unsigned long cpt = clocktick; | 67 | unsigned long cpt = clocktick; |
| 68 | 68 | ||
| 69 | profile_tick(CPU_PROFILING, regs); | 69 | profile_tick(CPU_PROFILING); |
| 70 | 70 | ||
| 71 | /* Initialize next_tick to the expected tick time. */ | 71 | /* Initialize next_tick to the expected tick time. */ |
| 72 | next_tick = cpu_data[cpu].it_value; | 72 | next_tick = cpu_data[cpu].it_value; |