cpumask: cpu_all_mask: pointer version of cpu_mask_all. Deprecate cpu_mask_all, use cpu_all_mask, which doesn't require struct cpumask definition. Signed-off-by: Rusty Russell --- include/linux/cpumask.h | 6 +++--- kernel/cpu.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff -r c510b939745b include/linux/cpumask.h --- a/include/linux/cpumask.h Mon Sep 29 22:36:07 2008 +1000 +++ b/include/linux/cpumask.h Mon Sep 29 22:43:36 2008 +1000 @@ -114,7 +114,7 @@ typedef struct cpumask cpumask_t; typedef struct cpumask cpumask_t; extern cpumask_t _unused_cpumask_arg_; -#define CPU_MASK_ALL_PTR (&cpu_mask_all) +#define CPU_MASK_ALL_PTR (cpu_all_mask) #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)) @@ -168,6 +168,7 @@ extern cpumask_t _unused_cpumask_arg_; #define cpu_online_map (*(cpumask_t *)cpu_online_mask) #define cpu_present_map (*(cpumask_t *)cpu_present_mask) #define cpu_active_map (*(cpumask_t *)cpu_active_mask) +extern const struct cpumask cpu_mask_all; /* End deprecated region. */ #define CPU_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(NR_CPUS) @@ -384,8 +385,6 @@ static inline const struct cpumask *cpum return (const cpumask_t *)p; } -extern const struct cpumask cpu_mask_all; - #define CPU_MASK_NONE \ (cpumask_t) { { \ [0 ... BITS_TO_LONGS(NR_CPUS)-1] = 0UL \ @@ -526,6 +525,7 @@ extern const struct cpumask *const cpu_o extern const struct cpumask *const cpu_online_mask; extern const struct cpumask *const cpu_present_mask; extern const struct cpumask *const cpu_active_mask; +extern const struct cpumask *const cpu_all_mask; /* Wrappers to manipulate otherwise-constant masks. */ void set_cpu_possible(unsigned int cpu, bool possible); diff -r c510b939745b kernel/cpu.c --- a/kernel/cpu.c Mon Sep 29 22:36:07 2008 +1000 +++ b/kernel/cpu.c Mon Sep 29 22:43:36 2008 +1000 @@ -464,6 +464,8 @@ const struct cpumask cpu_mask_all = { { [BITS_TO_LONGS(NR_CPUS)-1] = BITMAP_LAST_WORD_MASK(NR_CPUS), } }; EXPORT_SYMBOL(cpu_mask_all); +const struct cpumask *const cpu_all_mask = &cpu_mask_all; +EXPORT_SYMBOL(cpu_all_mask); static struct cpumask _cpu_possible_mask __read_mostly; const struct cpumask *const cpu_possible_mask = &_cpu_possible_mask;