The following commit has been merged into the timers/core branch of tip: Commit-ID: 4f9f4f0f6261e4b162dfcaf91e08824a7c93da07 Gitweb: https://git.kernel.org/tip/4f9f4f0f6261e4b162dfcaf91e08824a7c93da07 Author: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx> AuthorDate: Tue, 11 May 2021 15:48:56 +08:00 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitterDate: Thu, 03 Jun 2021 22:15:12 +02:00 clocksource/drivers/arm_arch_timer: Remove arch_timer_rate1 This variable is added by my mistake, it's not used at all. Fixes: e2bf384d4329 ("clocksource/drivers/arm_arch_timer: Add __ro_after_init and __init") Signed-off-by: Jisheng Zhang <Jisheng.Zhang@xxxxxxxxxxxxx> Reported-by: Hulk Robot <hulkci@xxxxxxxxxx> Acked-by: Marc Zyngier <maz@xxxxxxxxxx> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Link: https://lore.kernel.org/r/20210511154856.6afbcb65@xhacker.debian --- drivers/clocksource/arm_arch_timer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index fe1a826..89a9e05 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -64,7 +64,6 @@ struct arch_timer { #define to_arch_timer(e) container_of(e, struct arch_timer, evt) static u32 arch_timer_rate __ro_after_init; -u32 arch_timer_rate1 __ro_after_init; static int arch_timer_ppi[ARCH_TIMER_MAX_TIMER_PPI] __ro_after_init; static const char *arch_timer_ppi_names[ARCH_TIMER_MAX_TIMER_PPI] = {