summaryrefslogtreecommitdiffstats
path: root/include/asm-mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-10-12 00:46:09 +0200
committerRalf Baechle <ralf@linux-mips.org>2007-10-12 00:46:09 +0200
commit91a2fcc88634663e9e13dcdfad0e4a860e64aeee (patch)
treea86b936f1057207d46e5a07ed826052ff640869a /include/asm-mips
parent[MIPS] Switch from to_tm to rtc_time_to_tm (diff)
downloadlinux-91a2fcc88634663e9e13dcdfad0e4a860e64aeee.tar.xz
linux-91a2fcc88634663e9e13dcdfad0e4a860e64aeee.zip
[MIPS] Consolidate all variants of MIPS cp0 timer interrupt handlers.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r--include/asm-mips/time.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h
index 963507d33f69..3516b32c9efb 100644
--- a/include/asm-mips/time.h
+++ b/include/asm-mips/time.h
@@ -49,20 +49,14 @@ extern void (*mips_timer_ack)(void);
extern struct clocksource clocksource_mips;
/*
- * high-level timer interrupt routines.
+ * The low-level timer interrupt routine.
*/
-extern irqreturn_t timer_interrupt(int irq, void *dev_id);
-
-/*
- * the corresponding low-level timer interrupt routine.
- */
-extern asmlinkage void ll_timer_interrupt(int irq);
+extern void ll_timer_interrupt(int irq, void *dev_id);
/*
* profiling and process accouting is done separately in local_timer_interrupt
*/
extern void local_timer_interrupt(int irq, void *dev_id);
-extern asmlinkage void ll_local_timer_interrupt(int irq);
/*
* board specific routines required by time_init().
@@ -78,4 +72,10 @@ extern void plat_timer_setup(struct irqaction *irq);
*/
extern unsigned int mips_hpt_frequency;
+/*
+ * The performance counter IRQ on MIPS is a close relative to the timer IRQ
+ * so it lives here.
+ */
+extern int (*perf_irq)(void);
+
#endif /* _ASM_TIME_H */