housekeeping_any_cpu() doesn't handle correctly the case where CONFIG_NO_HZ_FULL=y and no CPU is in nohz_full mode. So far no caller needs this but lets prepare to avoid any future surprise.
Signed-off-by: Frederic Weisbecker <fweis...@gmail.com> Cc: Chris Metcalf <cmetc...@mellanox.com> Cc: Rik van Riel <r...@redhat.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Mike Galbraith <efa...@gmx.de> Cc: Ingo Molnar <mi...@kernel.org> Cc: Christoph Lameter <c...@linux.com> Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com> Cc: Wanpeng Li <kernel...@gmail.com> Cc: Luiz Capitulino <lcapitul...@redhat.com> --- include/linux/housekeeping.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/include/linux/housekeeping.h b/include/linux/housekeeping.h index 3d6a8e6..64d0ee5 100644 --- a/include/linux/housekeeping.h +++ b/include/linux/housekeeping.h @@ -7,24 +7,19 @@ #ifdef CONFIG_NO_HZ_FULL extern cpumask_var_t housekeeping_mask; - -static inline int housekeeping_any_cpu(void) -{ - return cpumask_any_and(housekeeping_mask, cpu_online_mask); -} - extern void __init housekeeping_init(void); - #else - -static inline int housekeeping_any_cpu(void) -{ - return smp_processor_id(); -} - static inline void housekeeping_init(void) { } #endif /* CONFIG_NO_HZ_FULL */ +static inline int housekeeping_any_cpu(void) +{ +#ifdef CONFIG_NO_HZ_FULL + if (tick_nohz_full_enabled()) + return cpumask_any_and(housekeeping_mask, cpu_online_mask); +#endif + return smp_processor_id(); +} static inline const struct cpumask *housekeeping_cpumask(void) { -- 2.7.4