ARM: bcm: stop selecing CONFIG_TICK_ONESHOT
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Feb 2024 12:38:42 +0000 (13:38 +0100)
committerFlorian Fainelli <florian.fainelli@broadcom.com>
Wed, 28 Feb 2024 18:32:25 +0000 (10:32 -0800)
ARCH_BCM_MOBILE is the only platform that selects CONFIG_TICK_ONESHOT,
the others stopped 12 years ago in commit 98fab064d321 ("ARM: Remove
unnecessary selection of TICK_ONESHOT").

This inconsistency caused a build regression after an otherwise
correct change to the timers subsystem:

kernel/time/tick-sched.c:1599:6: error: redefinition of 'tick_sched_timer_dying'
 1599 | void tick_sched_timer_dying(int cpu)
      |      ^
kernel/time/tick-sched.h:111:20: note: previous definition is here
  111 | static inline void tick_sched_timer_dying(int cpu) { }

Drop this dead select.

Fixes: 3aedb7fcd88a ("tick/sched: Remove useless oneshot ifdeffery")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240228123850.3499024-2-arnd@kernel.org
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
arch/arm/mach-bcm/Kconfig

index 8789d93a7c04b3929452ceed8063c024a794e815..7318d8789e2486900bb9d63d20a56d3675bc03e7 100644 (file)
@@ -93,7 +93,6 @@ config ARCH_BCM_MOBILE
        select ARM_ERRATA_775420
        select ARM_GIC
        select GPIO_BCM_KONA
-       select TICK_ONESHOT
        select HAVE_ARM_ARCH_TIMER
        select PINCTRL
        select ARCH_BCM_MOBILE_SMP if SMP