diff options
| author | Anton Blanchard <anton@samba.org> | 2011-01-29 12:37:16 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-02-07 13:06:06 +1100 |
| commit | 429f4d8d20b91e4a6c239f951c06a56a6ac22957 (patch) | |
| tree | a769884691712169b7c1a109dd5eb744a2a12c53 /arch | |
| parent | fe5cfd63557b39007460d17c585b8dc5ed6ace93 (diff) | |
| download | linux-429f4d8d20b91e4a6c239f951c06a56a6ac22957.tar.gz linux-429f4d8d20b91e4a6c239f951c06a56a6ac22957.tar.bz2 linux-429f4d8d20b91e4a6c239f951c06a56a6ac22957.zip | |
powerpc/numa: Fix bug in unmap_cpu_from_node
When converting to the new cpumask code I screwed up:
- if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) {
- cpu_clear(cpu, numa_cpumask_lookup_table[node]);
+ if (cpumask_test_cpu(cpu, node_to_cpumask_map[node])) {
+ cpumask_set_cpu(cpu, node_to_cpumask_map[node]);
This was introduced in commit 25863de07af9 (powerpc/cpumask: Convert NUMA code
to new cpumask API)
Fix it.
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 3cf33494a5ae..fd4812329570 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -186,7 +186,7 @@ static void unmap_cpu_from_node(unsigned long cpu) dbg("removing cpu %lu from node %d\n", cpu, node); if (cpumask_test_cpu(cpu, node_to_cpumask_map[node])) { - cpumask_set_cpu(cpu, node_to_cpumask_map[node]); + cpumask_clear_cpu(cpu, node_to_cpumask_map[node]); } else { printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n", cpu, node); |