[PATCH v2 00/15] Runtime registration for local timers · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 01/15] ARM: smp_twd: make local_timer_stop a symbol instead of a #define · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 02/15] ARM: local timers: introduce a new registration interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 03/15] ARM: smp_twd: add runtime registration support · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 04/15] ARM: smp_twd: add device tree support · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 05/15] ARM: OMAP4: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 06/15] ARM: plat-versatile: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 07/15] ARM: tegra: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 08/15] ARM: shmobile: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 09/15] ARM: ux500: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface · Rob Herring <hidden> · 2012-01-13
[PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface · Shawn Guo <hidden> · 2012-01-14
[PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface · Russell King - ARM Linux <hidden> · 2012-01-14
[PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface · Rob Herring <hidden> · 2012-01-14
[PATCH v2 11/15] ARM: imx6q: convert to twd_local_timer_register() interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 11/15] ARM: imx6q: convert to twd_local_timer_register() interface · Shawn Guo <hidden> · 2012-01-14
[PATCH v2 12/15] ARM: smp_twd: remove old local timer interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 13/15] ARM: local timers: convert exynos to runtime registration interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 13/15] ARM: local timers: convert exynos to runtime registration interface · David Brown <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · Marc Zyngier <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · David Brown <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · Russell King - ARM Linux <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · David Brown <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · David Brown <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · Russell King - ARM Linux <hidden> · 2012-01-13
[PATCH v2 14/15] ARM: local timers: convert MSM to runtime registration interface · Marc Zyngier <hidden> · 2012-01-14
[PATCH v2 15/15] ARM: local timers: make the runtime registration interface mandatory · Marc Zyngier <hidden> · 2012-01-13

STALE5322d

[PATCH v2 01/15] ARM: smp_twd: make local_timer_stop a symbol instead of a #define

From: Marc Zyngier <hidden>
Date: 2012-01-13 18:28:28
Subsystem: arm port, the rest · Maintainers: Russell King, Linus Torvalds

When CONFIG_HAVE_ARM_TWD is selected, local_timer_stop is a #define,
while all other local timers are using a real function.

Convert it to an alias of twd_timer_stop, as it helps converting
all local timers to another internal API in a sane way.

Signed-off-by: Marc Zyngier <redacted>
---
 arch/arm/include/asm/localtimer.h |    6 +-----
 arch/arm/include/asm/smp_twd.h    |    1 -
 arch/arm/kernel/smp_twd.c         |    7 ++++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/include/asm/localtimer.h b/arch/arm/include/asm/localtimer.h
index c6a1842..7e1b2c5 100644
--- a/arch/arm/include/asm/localtimer.h
+++ b/arch/arm/include/asm/localtimer.h

@@ -26,17 +26,13 @@ void percpu_timer_setup(void);
 
 #include "smp_twd.h"
 
-#define local_timer_stop(c)	twd_timer_stop((c))
-
-#else
+#endif
 
 /*
  * Stop the local timer
  */
 void local_timer_stop(struct clock_event_device *);
 
-#endif
-
 /*
  * Setup a local timer interrupt for a CPU.
  */

diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
index ef9ffba9..bf8449d 100644
--- a/arch/arm/include/asm/smp_twd.h
+++ b/arch/arm/include/asm/smp_twd.h

@@ -23,6 +23,5 @@ struct clock_event_device;
 extern void __iomem *twd_base;
 
 void twd_timer_setup(struct clock_event_device *);
-void twd_timer_stop(struct clock_event_device *);
 
 #endif

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index c8e9385..95a0c14 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c

@@ -87,12 +87,17 @@ int twd_timer_ack(void)
 	return 0;
 }
 
-void twd_timer_stop(struct clock_event_device *clk)
+static void twd_timer_stop(struct clock_event_device *clk)
 {
 	twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
 	disable_percpu_irq(clk->irq);
 }
 
+/* Temporary hack to be removed when all TWD users are converted to
+   the new registration interface */
+void local_timer_stop(struct clock_event_device *clk)
+	__attribute__ ((alias ("twd_timer_stop")));
+
 #ifdef CONFIG_CPU_FREQ
 
 /*

-- 
1.7.7.1