diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-27 11:03:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-27 11:03:30 +1100 |
| commit | 0900a401302884ff3bb91e4739c2fa9e1416a10f (patch) | |
| tree | 7164d6c30fa7b91c3787df363926649297fdb818 /include | |
| parent | b1332629ef23165d8154937ba88812903d3e83ad (diff) | |
cpumask:CPU_BITS_ALL-and-CPU_BITS_NONE
Since we're now preferring raw bitmaps for (eventually rare) static
cpumasks, we replace CPU_MASK_X with CPU_BITS_X.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpumask.h | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 7f916e88ac4d..b204093c7d44 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -53,8 +53,9 @@ * * size_t cpumask_size() Length of cpumask in bytes. * const struct cpumask *cpumask_of(cpu) Return cpumask with bit 'cpu' set - * CPU_MASK_ALL Initializer - all bits set - * CPU_MASK_NONE Initializer - no bits set + * CPU_BITS_ALL Initializer - all bits set + * CPU_BITS_NONE Initializer - no bits set + * CPU_BITS_CPU0 Initializer - first bit set * unsigned long *cpumask_bits(mask) Array of unsigned long's in mask * * struct cpumask *to_cpumask(const unsigned long[]) @@ -115,6 +116,9 @@ struct cpumask { typedef struct cpumask cpumask_t; extern cpumask_t _unused_cpumask_arg_; +#define CPU_MASK_ALL ((cpumask_t){ CPU_BITS_ALL }) +#define CPU_MASK_NONE ((cpumask_t){ CPU_BITS_NONE }) +#define CPU_MASK_CPU0 ((cpumask_t){ CPU_BITS_CPU0 }) #define cpu_set(cpu, dst) cpumask_set_cpu((cpu), &(dst)) #define cpu_clear(cpu, dst) cpumask_clear_cpu((cpu), &(dst)) #define cpu_test_and_set(cpu, mask) cpumask_test_and_set_cpu((cpu), &(mask)) @@ -400,20 +404,20 @@ static inline const struct cpumask *cpumask_of(unsigned int cpu) #if NR_CPUS <= BITS_PER_LONG -#define CPU_MASK_ALL \ -(cpumask_t) { { \ - [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \ -} } +#define CPU_BITS_ALL \ +{ \ + [BITS_TO_LONGS(CONFIG_NR_CPUS)-1] = CPU_MASK_LAST_WORD \ +} #define CPU_MASK_ALL_PTR (&CPU_MASK_ALL) #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 \ -} } +#define CPU_BITS_ALL \ +{ \ + [0 ... BITS_TO_LONGS(CONFIG_NR_CPUS)-2] = ~0UL, \ + [BITS_TO_LONGS(CONFIG_NR_CPUS)-1] = CPU_MASK_LAST_WORD \ +} /* cpu_mask_all is in init/main.c */ extern cpumask_t cpu_mask_all; @@ -421,15 +425,15 @@ extern cpumask_t cpu_mask_all; #endif -#define CPU_MASK_NONE \ -(cpumask_t) { { \ - [0 ... BITS_TO_LONGS(NR_CPUS)-1] = 0UL \ -} } +#define CPU_BITS_NONE \ +{ \ + [0 ... BITS_TO_LONGS(CONFIG_NR_CPUS)-1] = 0UL \ +} -#define CPU_MASK_CPU0 \ -(cpumask_t) { { \ - [0] = 1UL \ -} } +#define CPU_BITS_CPU0 \ +{ \ + [0] = 1UL \ +} #if NR_CPUS == 1 |