[14/17] clocksource/drivers/arm_arch_timer: Fix DEFINE_PER_CPU expansion

Message ID 1509312035-17368-14-git-send-email-daniel.lezcano@linaro.org
State Accepted
Commit a7fb4577bbe307dd3dd971c7ea8f35a68fc031ca
Headers show
  • [01/17] dt-bindings: timer: renesas, cmt: Fix SoC-specific compatible values
Related show

Commit Message

Daniel Lezcano Oct. 29, 2017, 9:20 p.m.
From: Mark Rutland <mark.rutland@arm.com>

Our ctags mangling script can't handle newlines inside of a
DEFINE_PER_CPU(), leading to an annoying message whenever tags are

  ctags: Warning: drivers/clocksource/arm_arch_timer.c:302: null expansion of name pattern "\1"

This was dealt with elsewhere in commit:

  25528213fe9f75f4 ("tags: Fix DEFINE_PER_CPU expansions")

... by ensuring each DEFINE_PER_CPU() was contained on a single line,
even where this would violate the usual code style (checkpatch warnings
and all).

Let's do the same for the arch timer driver, and get rid of the

Signed-off-by: Mark Rutland <mark.rutland@arm.com>

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

 drivers/clocksource/arm_arch_timer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 14e2419..0ecf5be 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -299,8 +299,7 @@  static u64 notrace arm64_858921_read_cntvct_el0(void)
-DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *,
-	       timer_unstable_counter_workaround);
+DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *, timer_unstable_counter_workaround);