[RFC PATCH 20/20] ARM: simplify percpu_timer_ack
From: Marc Zyngier <hidden>
Date: 2011-03-02 16:53:26
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
There is no provider of local_timer_ack anymore after the conversion of msm to the percpu_timer interface. Remove the weak local_timer_ack symbol and directly call percpu_timer_ack. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Marc Zyngier <redacted> --- arch/arm/kernel/percpu_timer.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/arch/arm/kernel/percpu_timer.c b/arch/arm/kernel/percpu_timer.c
index 85af863..6e1942b 100644
--- a/arch/arm/kernel/percpu_timer.c
+++ b/arch/arm/kernel/percpu_timer.c@@ -60,24 +60,18 @@ void percpu_timer_register(struct local_timer_ops *ops) * * If a local timer interrupt has occurred, acknowledge and return 1. * Otherwise, return 0. - * - * This can be overloaded by platform code that doesn't provide its - * timer in timer_fns way (msm at the moment). Once all platforms have - * migrated, the weak alias can be removed. */ static int percpu_timer_ack(void) { return timer_ops->ack(); } -int local_timer_ack(void) __attribute__ ((weak, alias("percpu_timer_ack"))); - asmlinkage void __exception_irq_entry do_local_timer(struct pt_regs *regs) { struct pt_regs *old_regs = set_irq_regs(regs); int cpu = smp_processor_id(); - if (local_timer_ack()) { + if (percpu_timer_ack()) { __inc_irq_stat(cpu, local_timer_irqs); percpu_timer_run(); }
--
1.7.0.4