Commit b5122059 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] x86: fix up cpumask breakage

We can't do

	&some_inline_function();
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0fd186c0
...@@ -1192,7 +1192,9 @@ __init void arch_init_sched_domains(void) ...@@ -1192,7 +1192,9 @@ __init void arch_init_sched_domains(void)
int j; int j;
cpumask_t nodemask; cpumask_t nodemask;
struct sched_group *node = &sched_group_nodes[i]; struct sched_group *node = &sched_group_nodes[i];
cpus_and(nodemask, node_to_cpumask(i), cpu_possible_map); cpumask_t node_cpumask = node_to_cpumask(i);
cpus_and(nodemask, node_cpumask, cpu_possible_map);
if (cpus_empty(nodemask)) if (cpus_empty(nodemask))
continue; continue;
...@@ -1228,7 +1230,9 @@ __init void arch_init_sched_domains(void) ...@@ -1228,7 +1230,9 @@ __init void arch_init_sched_domains(void)
for (i = 0; i < MAX_NUMNODES; i++) { for (i = 0; i < MAX_NUMNODES; i++) {
struct sched_group *cpu = &sched_group_nodes[i]; struct sched_group *cpu = &sched_group_nodes[i];
cpumask_t nodemask; cpumask_t nodemask;
cpus_and(nodemask, node_to_cpumask(i), cpu_possible_map); cpumask_t node_cpumask = node_to_cpumask(i);
cpus_and(nodemask, node_cpumask, cpu_possible_map);
if (cpus_empty(nodemask)) if (cpus_empty(nodemask))
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment