From: Rusty Russell Subject: cpumask: select disabling obsolete cpumask functions on x86 It currently depends on CONFIG_BROKEN; change to be set by CONFIG_CPUMASK_OFFSTACK now it all compiles. We also complete it: the header shouldn't refer to the deprected CPU_MASK_LAST_WORD, and the deprecated implementations are removed. Signed-off-by: Rusty Russell Cc: Arnd Bergmann Cc: anton@samba.org Cc: KOSAKI Motohiro Cc: Mike Travis --- include/linux/cpumask.h | 4 ++-- include/linux/sched.h | 2 +- lib/Kconfig | 8 ++++++-- lib/cpumask.c | 2 ++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -716,7 +716,7 @@ static inline const struct cpumask *get_ #if NR_CPUS <= BITS_PER_LONG #define CPU_BITS_ALL \ { \ - [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \ + [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS) \ } #else /* NR_CPUS > BITS_PER_LONG */ @@ -724,7 +724,7 @@ static inline const struct cpumask *get_ #define CPU_BITS_ALL \ { \ [0 ... BITS_TO_LONGS(NR_CPUS)-2] = ~0UL, \ - [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \ + [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS) \ } #endif /* NR_CPUS > BITS_PER_LONG */ diff --git a/include/linux/sched.h b/include/linux/sched.h --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1774,7 +1774,7 @@ static inline int set_cpus_allowed_ptr(s } #endif -#ifndef CONFIG_CPUMASK_OFFSTACK +#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask) { return set_cpus_allowed_ptr(p, &new_mask); diff --git a/lib/Kconfig b/lib/Kconfig --- a/lib/Kconfig +++ b/lib/Kconfig @@ -191,9 +191,13 @@ config CPUMASK_OFFSTACK them on the stack. This is a bit more expensive, but avoids stack overflow. +# Only ask if we haven't set cpumask_offstack. config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS - bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS - depends on EXPERIMENTAL && BROKEN + bool "Disable obsolete cpumask functions" if !CPUMASK_OFFSTACK + default y if CPUMASK_OFFSTACK + help + Remove the definitions of the obsolete cpus_ functions which are + dangerous with offstack (ie. dynamically allocated) cpumasks. # # Netlink attribute parsing support is select'ed if needed diff --git a/lib/cpumask.c b/lib/cpumask.c --- a/lib/cpumask.c +++ b/lib/cpumask.c @@ -5,6 +5,7 @@ #include #include +#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS int __first_cpu(const cpumask_t *srcp) { return min_t(int, NR_CPUS, find_first_bit(srcp->bits, NR_CPUS)); @@ -37,6 +38,7 @@ int __any_online_cpu(const cpumask_t *ma return cpu; } EXPORT_SYMBOL(__any_online_cpu); +#endif /* CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */ /** * cpumask_next_and - get the next cpu in *src1p & *src2p