diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 20:12:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 20:12:11 -0700 |
| commit | ada26d41e9ee1da31d11957b4452f4227a292e10 (patch) | |
| tree | dfaf212edd5f6d1b749226cdd35c706cdc0f3c14 /arch/parisc | |
| 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')
| -rw-r--r-- | arch/parisc/kernel/irq.c | 6 | ||||
| -rw-r--r-- | arch/parisc/kernel/time.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 9bdd0197ceb..2ece7c7939f 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -35,8 +35,8 @@ #undef PARISC_IRQ_CR16_COUNTS -extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *); -extern irqreturn_t ipi_interrupt(int, void *, struct pt_regs *); +extern irqreturn_t timer_interrupt(int, void *); +extern irqreturn_t ipi_interrupt(int, void *); #define EIEM_MASK(irq) (1UL<<(CPU_IRQ_MAX - irq)) @@ -375,7 +375,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) goto set_out; } #endif - __do_IRQ(irq, regs); + __do_IRQ(irq); out: irq_exit(); diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 1d58ce0e37a..b44839203e6 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) /* gcc can optimize for "read-only" case with a local clocktick */ unsigned long cpt = clocktick; - profile_tick(CPU_PROFILING, regs); + profile_tick(CPU_PROFILING); /* Initialize next_tick to the expected tick time. */ next_tick = cpu_data[cpu].it_value; |