diff mbox series

[2/2] ARM: bcm: stop selecing CONFIG_TICK_ONESHOT

Message ID 20240228123850.3499024-2-arnd@kernel.org
State New
Headers
Series [1/2] tick/sched: fix build failure for CONFIG_NO_HZ_COMMON=n |

Commit Message

Arnd Bergmann Feb. 28, 2024, 12:38 p.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

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>
---
 arch/arm/mach-bcm/Kconfig | 1 -
 1 file changed, 1 deletion(-)

Comments

Florian Fainelli Feb. 28, 2024, 6:32 p.m. UTC | #1 
From: Florian Fainelli <f.fainelli@gmail.com>

On Wed, 28 Feb 2024 13:38:42 +0100, Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/soc/next, thanks!
--
Florian
diff mbox series

Patch

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 8df4b23e2699..ed6415e7e3a4 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -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