diff options
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r-- | arch/arm/include/asm/hardware/gic.h | 1 | ||||
-rw-r--r-- | arch/arm/include/asm/localtimer.h | 16 | ||||
-rw-r--r-- | arch/arm/include/asm/smp_twd.h | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h index 435d3f86c708..2dadd50a77d2 100644 --- a/arch/arm/include/asm/hardware/gic.h +++ b/arch/arm/include/asm/hardware/gic.h | |||
@@ -40,7 +40,6 @@ void gic_init(unsigned int, unsigned int, void __iomem *, void __iomem *); | |||
40 | void gic_secondary_init(unsigned int); | 40 | void gic_secondary_init(unsigned int); |
41 | void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); | 41 | void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); |
42 | void gic_raise_softirq(const struct cpumask *mask, unsigned int irq); | 42 | void gic_raise_softirq(const struct cpumask *mask, unsigned int irq); |
43 | void gic_enable_ppi(unsigned int); | ||
44 | 43 | ||
45 | struct gic_chip_data { | 44 | struct gic_chip_data { |
46 | unsigned int irq_offset; | 45 | unsigned int irq_offset; |
diff --git a/arch/arm/include/asm/localtimer.h b/arch/arm/include/asm/localtimer.h index 5c8acb4c4040..f5e1cec7e35c 100644 --- a/arch/arm/include/asm/localtimer.h +++ b/arch/arm/include/asm/localtimer.h | |||
@@ -19,26 +19,20 @@ struct clock_event_device; | |||
19 | */ | 19 | */ |
20 | void percpu_timer_setup(void); | 20 | void percpu_timer_setup(void); |
21 | 21 | ||
22 | /* | ||
23 | * Per-cpu timer IRQ handler | ||
24 | */ | ||
25 | irqreturn_t percpu_timer_handler(int irq, void *dev_id); | ||
26 | |||
27 | #ifdef CONFIG_LOCAL_TIMERS | 22 | #ifdef CONFIG_LOCAL_TIMERS |
28 | 23 | ||
29 | #ifdef CONFIG_HAVE_ARM_TWD | 24 | #ifdef CONFIG_HAVE_ARM_TWD |
30 | 25 | ||
31 | #include "smp_twd.h" | 26 | #include "smp_twd.h" |
32 | 27 | ||
33 | #define local_timer_ack() twd_timer_ack() | 28 | #define local_timer_stop(c) twd_timer_stop((c)) |
34 | 29 | ||
35 | #else | 30 | #else |
36 | 31 | ||
37 | /* | 32 | /* |
38 | * Platform provides this to acknowledge a local timer IRQ. | 33 | * Stop the local timer |
39 | * Returns true if the local timer IRQ is to be processed. | ||
40 | */ | 34 | */ |
41 | int local_timer_ack(void); | 35 | void local_timer_stop(struct clock_event_device *); |
42 | 36 | ||
43 | #endif | 37 | #endif |
44 | 38 | ||
@@ -53,6 +47,10 @@ static inline int local_timer_setup(struct clock_event_device *evt) | |||
53 | { | 47 | { |
54 | return -ENXIO; | 48 | return -ENXIO; |
55 | } | 49 | } |
50 | |||
51 | static inline void local_timer_stop(struct clock_event_device *evt) | ||
52 | { | ||
53 | } | ||
56 | #endif | 54 | #endif |
57 | 55 | ||
58 | #endif | 56 | #endif |
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h index fed9981fba08..ef9ffba97ad8 100644 --- a/arch/arm/include/asm/smp_twd.h +++ b/arch/arm/include/asm/smp_twd.h | |||
@@ -22,7 +22,7 @@ struct clock_event_device; | |||
22 | 22 | ||
23 | extern void __iomem *twd_base; | 23 | extern void __iomem *twd_base; |
24 | 24 | ||
25 | int twd_timer_ack(void); | ||
26 | void twd_timer_setup(struct clock_event_device *); | 25 | void twd_timer_setup(struct clock_event_device *); |
26 | void twd_timer_stop(struct clock_event_device *); | ||
27 | 27 | ||
28 | #endif | 28 | #endif |