diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-06-24 02:37:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-24 02:37:46 -0700 |
| commit | b51220590b27096ef295adf290bd6af3c2bfb04d (patch) | |
| tree | 919cf9694fe1e63bcbecea9b4046057d4c586b47 | |
| parent | 0fd186c070104cf23a41a05685c7bf89acbcbc60 (diff) | |
[PATCH] x86: fix up cpumask breakage
We can't do
&some_inline_function();
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index c3fa2538ad2e..27bda2a137d5 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c @@ -1192,7 +1192,9 @@ __init void arch_init_sched_domains(void) int j; cpumask_t nodemask; 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)) continue; @@ -1228,7 +1230,9 @@ __init void arch_init_sched_domains(void) for (i = 0; i < MAX_NUMNODES; i++) { struct sched_group *cpu = &sched_group_nodes[i]; 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)) continue; |