drivers/base/cpu.c: use __cpu_*_mask directly
The only user of the lvalue-ness of the cpu_*_mask variables is in drivers/base/cpu.c, and that is mostly a work-around for the fact that not even const variables can be used in static initialization. Now that the underlying struct cpumasks are exposed we can take their address. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Acked-by: Rusty Russell <rusty@rustcorp.com.au> Acked-by: 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:
parent
4b804c85dc
commit
848e239155
|
@ -200,7 +200,7 @@ static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
|
||||||
|
|
||||||
struct cpu_attr {
|
struct cpu_attr {
|
||||||
struct device_attribute attr;
|
struct device_attribute attr;
|
||||||
const struct cpumask *const * const map;
|
const struct cpumask *const map;
|
||||||
};
|
};
|
||||||
|
|
||||||
static ssize_t show_cpus_attr(struct device *dev,
|
static ssize_t show_cpus_attr(struct device *dev,
|
||||||
|
@ -209,7 +209,7 @@ static ssize_t show_cpus_attr(struct device *dev,
|
||||||
{
|
{
|
||||||
struct cpu_attr *ca = container_of(attr, struct cpu_attr, attr);
|
struct cpu_attr *ca = container_of(attr, struct cpu_attr, attr);
|
||||||
|
|
||||||
return cpumap_print_to_pagebuf(true, buf, *ca->map);
|
return cpumap_print_to_pagebuf(true, buf, ca->map);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define _CPU_ATTR(name, map) \
|
#define _CPU_ATTR(name, map) \
|
||||||
|
@ -217,9 +217,9 @@ static ssize_t show_cpus_attr(struct device *dev,
|
||||||
|
|
||||||
/* Keep in sync with cpu_subsys_attrs */
|
/* Keep in sync with cpu_subsys_attrs */
|
||||||
static struct cpu_attr cpu_attrs[] = {
|
static struct cpu_attr cpu_attrs[] = {
|
||||||
_CPU_ATTR(online, &cpu_online_mask),
|
_CPU_ATTR(online, &__cpu_online_mask),
|
||||||
_CPU_ATTR(possible, &cpu_possible_mask),
|
_CPU_ATTR(possible, &__cpu_possible_mask),
|
||||||
_CPU_ATTR(present, &cpu_present_mask),
|
_CPU_ATTR(present, &__cpu_present_mask),
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue