diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-02-28 13:38:41 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-02-29 17:41:29 +0100 |
| commit | a184d9835a0a689261ea6a4a8dbc18173a031b77 (patch) | |
| tree | 4657f121873e3b21eee07963361d361550108776 /kernel/time | |
| parent | 8b3843ae3634b472530fb69c3861de0b70a5e6bf (diff) | |
| download | linux-a184d9835a0a689261ea6a4a8dbc18173a031b77.tar.gz linux-a184d9835a0a689261ea6a4a8dbc18173a031b77.tar.bz2 linux-a184d9835a0a689261ea6a4a8dbc18173a031b77.zip | |
tick/sched: Fix build failure for CONFIG_NO_HZ_COMMON=n
In configurations with CONFIG_TICK_ONESHOT but no CONFIG_NO_HZ or
CONFIG_HIGH_RES_TIMERS, tick_sched_timer_dying() is stubbed out,
but still defined as a global function as well:
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) { }
| ^
This configuration only appears with ARM CONFIG_ARCH_BCM_MOBILE,
which should not actually select CONFIG_TICK_ONESHOT.
Adjust the #ifdef for the stub to match the condition for building the
tick-sched.c file for consistency with the definition and to avoid
the build regression.
Fixes: 3aedb7fcd88a ("tick/sched: Remove useless oneshot ifdeffery")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240228123850.3499024-1-arnd@kernel.org
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h index 58d8d1c49dd3..e11c4dc65bcb 100644 --- a/kernel/time/tick-sched.h +++ b/kernel/time/tick-sched.h @@ -105,7 +105,7 @@ struct tick_sched { extern struct tick_sched *tick_get_tick_sched(int cpu); extern void tick_setup_sched_timer(bool hrtimer); -#if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS +#if defined CONFIG_TICK_ONESHOT extern void tick_sched_timer_dying(int cpu); #else static inline void tick_sched_timer_dying(int cpu) { } |