diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-06 10:38:14 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-14 19:21:52 +0000 |
commit | ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644 (patch) | |
tree | a0a5f36bc862c2163d4cc37333f46eb0257b3140 /arch/arm/kernel/smp_twd.c | |
parent | 7627dc802a98aebebc6a34e5b6558ea4717c968c (diff) | |
download | blackbird-op-linux-ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644.tar.gz blackbird-op-linux-ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644.zip |
ARM: GIC: move enablement of PPI interrupts to gic.c
Avoid adding nasty genirq-specific code to local timers to enable PPI
interrupts. Instead, provide a gic function to do this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/smp_twd.c')
-rw-r--r-- | arch/arm/kernel/smp_twd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 35882fbf37f9..67f933ec4177 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -127,8 +127,6 @@ static void __cpuinit twd_calibrate_rate(void) */ void __cpuinit twd_timer_setup(struct clock_event_device *clk) { - unsigned long flags; - twd_calibrate_rate(); clk->name = "local_timer"; @@ -143,10 +141,7 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) clk->min_delta_ns = clockevent_delta2ns(0xf, clk); /* Make sure our local interrupt controller has this enabled */ - local_irq_save(flags); - irq_to_desc(clk->irq)->status |= IRQ_NOPROBE; - get_irq_chip(clk->irq)->unmask(clk->irq); - local_irq_restore(flags); + gic_enable_ppi(clk->irq); clockevents_register_device(clk); } |