aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/mach
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/mach')
-rw-r--r--include/asm-arm/mach/irq.h9
-rw-r--r--include/asm-arm/mach/time.h4
2 files changed, 6 insertions, 7 deletions
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index 131f33733d25..0e017ecf2096 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 *);
30/* 30/*
31 * Obsolete inline function for calling irq descriptor handlers. 31 * Obsolete inline function for calling irq descriptor handlers.
32 */ 32 */
33static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc, 33static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
34 struct pt_regs *regs)
35{ 34{
36 desc->handle_irq(irq, desc, regs); 35 desc->handle_irq(irq, desc);
37} 36}
38 37
39void set_irq_flags(unsigned int irq, unsigned int flags); 38void set_irq_flags(unsigned int irq, unsigned int flags);
@@ -51,10 +50,10 @@ void set_irq_flags(unsigned int irq, unsigned int flags);
51#define irqdesc irq_desc 50#define irqdesc irq_desc
52#define irqchip irq_chip 51#define irqchip irq_chip
53 52
54#define do_bad_IRQ(irq,desc,regs) \ 53#define do_bad_IRQ(irq,desc) \
55do { \ 54do { \
56 spin_lock(&desc->lock); \ 55 spin_lock(&desc->lock); \
57 handle_bad_irq(irq, desc, regs); \ 56 handle_bad_irq(irq, desc); \
58 spin_unlock(&desc->lock); \ 57 spin_unlock(&desc->lock); \
59} while(0) 58} while(0)
60 59
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index 1eb93f5c0d6c..5dc357013b79 100644
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -57,7 +57,7 @@ struct dyn_tick_timer {
57 int (*enable)(void); /* Enables dynamic tick */ 57 int (*enable)(void); /* Enables dynamic tick */
58 int (*disable)(void); /* Disables dynamic tick */ 58 int (*disable)(void); /* Disables dynamic tick */
59 void (*reprogram)(unsigned long); /* Reprograms the timer */ 59 void (*reprogram)(unsigned long); /* Reprograms the timer */
60 int (*handler)(int, void *, struct pt_regs *); 60 int (*handler)(int, void *);
61}; 61};
62 62
63void timer_dyn_reprogram(void); 63void timer_dyn_reprogram(void);
@@ -66,7 +66,7 @@ void timer_dyn_reprogram(void);
66#endif 66#endif
67 67
68extern struct sys_timer *system_timer; 68extern struct sys_timer *system_timer;
69extern void timer_tick(struct pt_regs *); 69extern void timer_tick(void);
70 70
71/* 71/*
72 * Kernel time keeping support. 72 * Kernel time keeping support.