Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7fb4577 authored by Mark Rutland's avatar Mark Rutland Committed by Daniel Lezcano
Browse files

clocksource/drivers/arm_arch_timer: Fix DEFINE_PER_CPU expansion 



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

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

This was dealt with elsewhere in commit:

  25528213 ("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
distraction.

Signed-off-by: default avatarMark 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: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 21492e13

drivers/clocksource/arm_arch_timer.c

+1 −2
Original line number Diff line number Diff line
@@ -299,8 +299,7 @@ static u64 notrace arm64_858921_read_cntvct_el0(void) 
#endif



#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND

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);

EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround);



DEFINE_STATIC_KEY_FALSE(arch_timer_read_ool_enabled);