aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-10-06 22:47:23 -0400
committerMatthew Wilcox <willy@parisc-linux.org>2006-10-06 22:47:23 -0400
commitbe577a5220b25e0a6e3fbf96bbfc8b31d63e9ea9 (patch)
tree57e159a2b6f48c4b2f20497ced1d653a7fea4834 /arch
parente317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff)
Build fixes for struct pt_regs removal
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/kernel/irq.c6
-rw-r--r--arch/parisc/kernel/time.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 9bdd0197ceb7..2ece7c7939fe 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -35,8 +35,8 @@
35 35
36#undef PARISC_IRQ_CR16_COUNTS 36#undef PARISC_IRQ_CR16_COUNTS
37 37
38extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *); 38extern irqreturn_t timer_interrupt(int, void *);
39extern irqreturn_t ipi_interrupt(int, void *, struct pt_regs *); 39extern irqreturn_t ipi_interrupt(int, void *);
40 40
41#define EIEM_MASK(irq) (1UL<<(CPU_IRQ_MAX - irq)) 41#define EIEM_MASK(irq) (1UL<<(CPU_IRQ_MAX - irq))
42 42
@@ -375,7 +375,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
375 goto set_out; 375 goto set_out;
376 } 376 }
377#endif 377#endif
378 __do_IRQ(irq, regs); 378 __do_IRQ(irq);
379 379
380 out: 380 out:
381 irq_exit(); 381 irq_exit();
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;