Initial blind fixup for arm for irq changes

Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 6 insertions, 7 deletions

diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index 131f33733d2..0e017ecf209 100644
--- a/include/asm-arm/mach/irq.h
+++ b/include/asm-arm/mach/irq.h
@@ -30,10 +30,9 @@ extern int show_fiq_list(struct seq_file *, void *);
 /*
  * Obsolete inline function for calling irq descriptor handlers.
  */
-static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc,
-                                   struct pt_regs *regs)
+static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
 {
-        desc->handle_irq(irq, desc, regs);
+        desc->handle_irq(irq, desc);
 }
 
 void set_irq_flags(unsigned int irq, unsigned int flags);
@@ -51,10 +50,10 @@ void set_irq_flags(unsigned int irq, unsigned int flags);
 #define irqdesc         irq_desc
 #define irqchip         irq_chip
 
-#define do_bad_IRQ(irq,desc,regs)                       \
+#define do_bad_IRQ(irq,desc)                            \
 do {                                                    \
         spin_lock(&desc->lock);                         \
-        handle_bad_irq(irq, desc, regs);                \
+        handle_bad_irq(irq, desc);                      \
         spin_unlock(&desc->lock);                       \
 } while(0)
 
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index 1eb93f5c0d6..5dc357013b7 100644
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -57,7 +57,7 @@ struct dyn_tick_timer {
         int             (*enable)(void);        /* Enables dynamic tick */
         int             (*disable)(void);       /* Disables dynamic tick */
         void            (*reprogram)(unsigned long); /* Reprograms the timer */
-        int             (*handler)(int, void *, struct pt_regs *);
+        int             (*handler)(int, void *);
 };
 
 void timer_dyn_reprogram(void);
@@ -66,7 +66,7 @@ void timer_dyn_reprogram(void);
 #endif
 
 extern struct sys_timer *system_timer;
-extern void timer_tick(struct pt_regs *);
+extern void timer_tick(void);
 
 /*
  * Kernel time keeping support.