iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/cpu.c: change type of cpu_possible_bits and friends

Browse Source 
Change cpu_possible_bits and friends (online, present, active) from being
bitmaps that happen to have the right size to actually being struct
cpumasks.  Also rename them to __cpu_xyz_mask.  This is mostly a small
cleanup in preparation for exporting them and, eventually, eliminating the
extra indirection through the cpu_xyz_mask variables.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2016-01-20 15:00:16 -08:00 committed by Linus Torvalds
parent a051216427
commit c4c54dd1ca
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
kernel/cpu.c
View File

@ -759,71 +759,71 @@ const DECLARE_BITMAP(cpu_all_bits, NR_CPUS) = CPU_BITS_ALL;
EXPORT_SYMBOL(cpu_all_bits); EXPORT_SYMBOL(cpu_all_bits);
#ifdef CONFIG_INIT_ALL_POSSIBLE #ifdef CONFIG_INIT_ALL_POSSIBLE
static DECLARE_BITMAP(cpu_possible_bits, CONFIG_NR_CPUS) __read_mostly static struct cpumask __cpu_possible_mask __read_mostly
= CPU_BITS_ALL; = {CPU_BITS_ALL};
#else #else
static DECLARE_BITMAP(cpu_possible_bits, CONFIG_NR_CPUS) __read_mostly; static struct cpumask __cpu_possible_mask __read_mostly;
#endif #endif
const struct cpumask *const cpu_possible_mask = to_cpumask(cpu_possible_bits); const struct cpumask *const cpu_possible_mask = &__cpu_possible_mask;
EXPORT_SYMBOL(cpu_possible_mask); EXPORT_SYMBOL(cpu_possible_mask);
static DECLARE_BITMAP(cpu_online_bits, CONFIG_NR_CPUS) __read_mostly; static struct cpumask __cpu_online_mask __read_mostly;
const struct cpumask *const cpu_online_mask = to_cpumask(cpu_online_bits); const struct cpumask *const cpu_online_mask = &__cpu_online_mask;
EXPORT_SYMBOL(cpu_online_mask); EXPORT_SYMBOL(cpu_online_mask);
static DECLARE_BITMAP(cpu_present_bits, CONFIG_NR_CPUS) __read_mostly; static struct cpumask __cpu_present_mask __read_mostly;
const struct cpumask *const cpu_present_mask = to_cpumask(cpu_present_bits); const struct cpumask *const cpu_present_mask = &__cpu_present_mask;
EXPORT_SYMBOL(cpu_present_mask); EXPORT_SYMBOL(cpu_present_mask);
static DECLARE_BITMAP(cpu_active_bits, CONFIG_NR_CPUS) __read_mostly; static struct cpumask __cpu_active_mask __read_mostly;
const struct cpumask *const cpu_active_mask = to_cpumask(cpu_active_bits); const struct cpumask *const cpu_active_mask = &__cpu_active_mask;
EXPORT_SYMBOL(cpu_active_mask); EXPORT_SYMBOL(cpu_active_mask);
void set_cpu_possible(unsigned int cpu, bool possible) void set_cpu_possible(unsigned int cpu, bool possible)
{ {
if (possible) if (possible)
cpumask_set_cpu(cpu, to_cpumask(cpu_possible_bits)); cpumask_set_cpu(cpu, &__cpu_possible_mask);
else else
cpumask_clear_cpu(cpu, to_cpumask(cpu_possible_bits)); cpumask_clear_cpu(cpu, &__cpu_possible_mask);
} }
void set_cpu_present(unsigned int cpu, bool present) void set_cpu_present(unsigned int cpu, bool present)
{ {
if (present) if (present)
cpumask_set_cpu(cpu, to_cpumask(cpu_present_bits)); cpumask_set_cpu(cpu, &__cpu_present_mask);
else else
cpumask_clear_cpu(cpu, to_cpumask(cpu_present_bits)); cpumask_clear_cpu(cpu, &__cpu_present_mask);
} }
void set_cpu_online(unsigned int cpu, bool online) void set_cpu_online(unsigned int cpu, bool online)
{ {
if (online) { if (online) {
cpumask_set_cpu(cpu, to_cpumask(cpu_online_bits)); cpumask_set_cpu(cpu, &__cpu_online_mask);
cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits)); cpumask_set_cpu(cpu, &__cpu_active_mask);
} else { } else {
cpumask_clear_cpu(cpu, to_cpumask(cpu_online_bits)); cpumask_clear_cpu(cpu, &__cpu_online_mask);
} }
} }
void set_cpu_active(unsigned int cpu, bool active) void set_cpu_active(unsigned int cpu, bool active)
{ {
if (active) if (active)
cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits)); cpumask_set_cpu(cpu, &__cpu_active_mask);
else else
cpumask_clear_cpu(cpu, to_cpumask(cpu_active_bits)); cpumask_clear_cpu(cpu, &__cpu_active_mask);
} }
void init_cpu_present(const struct cpumask *src) void init_cpu_present(const struct cpumask *src)
{ {
cpumask_copy(to_cpumask(cpu_present_bits), src); cpumask_copy(&__cpu_present_mask, src);
} }
void init_cpu_possible(const struct cpumask *src) void init_cpu_possible(const struct cpumask *src)
{ {
cpumask_copy(to_cpumask(cpu_possible_bits), src); cpumask_copy(&__cpu_possible_mask, src);
} }
void init_cpu_online(const struct cpumask *src) void init_cpu_online(const struct cpumask *src)
{ {
cpumask_copy(to_cpumask(cpu_online_bits), src); cpumask_copy(&__cpu_online_mask, src);
} }