Commit 9941a383 authored by Rusty Russell's avatar Rusty Russell
Browse files

CPU_MASK_ALL/CPU_MASK_NONE: remove from deprecated region. 



They're used to initialize various static fields, though static
cpumasks should generally be avoided.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent e97636b4

include/linux/cpumask.h

+12 −19
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu) 
#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 */
@@ -776,7 +776,7 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu) 
#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 */
@@ -797,38 +797,31 @@ cpumap_print_to_pagebuf(bool list, char *buf, const struct cpumask *mask) 
				      nr_cpu_ids);

}



/*

 *

 * From here down, all obsolete.  Use cpumask_ variants!

 *

 */

#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS

#define cpumask_of_cpu(cpu) (*get_cpu_mask(cpu))



#define CPU_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(NR_CPUS)



#if NR_CPUS <= BITS_PER_LONG



#define CPU_MASK_ALL							\

(cpumask_t) { {								\

	[BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD			\

	[BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS)	\

} }



#else



#define CPU_MASK_ALL							\

(cpumask_t) { {								\

	[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

#endif /* NR_CPUS > BITS_PER_LONG */



#define CPU_MASK_NONE							\

(cpumask_t) { {								\

	[0 ... BITS_TO_LONGS(NR_CPUS)-1] =  0UL				\

} }



/*

 *

 * From here down, all obsolete.  Use cpumask_ variants!

 *

 */

#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS



#define CPU_MASK_CPU0							\

(cpumask_t) { {								\

	[0] =  1UL							\