Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aec01b8 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

kernel/cpu.c: eliminate cpu_*_mask 



Replace the variables cpu_possible_mask, cpu_online_mask, cpu_present_mask
and cpu_active_mask with macros expanding to expressions of the same type
and value, eliminating some indirection.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 848e2391

include/linux/cpumask.h

+4 −4
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ extern int nr_cpu_ids; 
 *    only one CPU.

 */



extern const struct cpumask *const cpu_possible_mask;

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 struct cpumask __cpu_possible_mask;

extern struct cpumask __cpu_online_mask;

extern struct cpumask __cpu_present_mask;

extern struct cpumask __cpu_active_mask;

#define cpu_possible_mask ((const struct cpumask *)&__cpu_possible_mask)

#define cpu_online_mask   ((const struct cpumask *)&__cpu_online_mask)

#define cpu_present_mask  ((const struct cpumask *)&__cpu_present_mask)

#define cpu_active_mask   ((const struct cpumask *)&__cpu_active_mask)



#if NR_CPUS > 1

#define num_online_cpus()	cpumask_weight(cpu_online_mask)

kernel/cpu.c

+0 −8
Original line number Diff line number Diff line
@@ -765,23 +765,15 @@ struct cpumask __cpu_possible_mask __read_mostly 
struct cpumask __cpu_possible_mask __read_mostly;

#endif

EXPORT_SYMBOL(__cpu_possible_mask);

const struct cpumask *const cpu_possible_mask = &__cpu_possible_mask;

EXPORT_SYMBOL(cpu_possible_mask);



struct cpumask __cpu_online_mask __read_mostly;

EXPORT_SYMBOL(__cpu_online_mask);

const struct cpumask *const cpu_online_mask = &__cpu_online_mask;

EXPORT_SYMBOL(cpu_online_mask);



struct cpumask __cpu_present_mask __read_mostly;

EXPORT_SYMBOL(__cpu_present_mask);

const struct cpumask *const cpu_present_mask = &__cpu_present_mask;

EXPORT_SYMBOL(cpu_present_mask);



struct cpumask __cpu_active_mask __read_mostly;

EXPORT_SYMBOL(__cpu_active_mask);

const struct cpumask *const cpu_active_mask = &__cpu_active_mask;

EXPORT_SYMBOL(cpu_active_mask);



void set_cpu_possible(unsigned int cpu, bool possible)

{