diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 17:51:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 17:51:39 -0500 |
commit | 9fc819172aa565c7be51f758b7e85301c9df7c70 (patch) | |
tree | 55bddc16c148257494ce912728422b32d5f96fbb | |
parent | 933a42b1842d0b7bc7e4e16f2f5f1099e72870d4 (diff) | |
parent | 44c36aed43b57ea12140957bebe76d711fbed653 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: cpumask_of_node() should handle -1 as a node
alpha: add myself as a maintainer, and drop mention of 2.4
-rw-r--r-- | MAINTAINERS | 3 | ||||
-rw-r--r-- | arch/alpha/include/asm/topology.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c8f47bf154f4..3f591629e953 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -410,9 +410,8 @@ F: drivers/i2c/busses/i2c-ali1563.c | |||
410 | 410 | ||
411 | ALPHA PORT | 411 | ALPHA PORT |
412 | M: Richard Henderson <rth@twiddle.net> | 412 | M: Richard Henderson <rth@twiddle.net> |
413 | S: Odd Fixes for 2.4; Maintained for 2.6. | ||
414 | M: Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 413 | M: Ivan Kokshaysky <ink@jurassic.park.msu.ru> |
415 | S: Maintained for 2.4; PCI support for 2.6. | 414 | M: Matt Turner <mattst88@gmail.com> |
416 | L: linux-alpha@vger.kernel.org | 415 | L: linux-alpha@vger.kernel.org |
417 | F: arch/alpha/ | 416 | F: arch/alpha/ |
418 | 417 | ||
diff --git a/arch/alpha/include/asm/topology.h b/arch/alpha/include/asm/topology.h index 36b3a30ba0e5..9251e13e144f 100644 --- a/arch/alpha/include/asm/topology.h +++ b/arch/alpha/include/asm/topology.h | |||
@@ -28,6 +28,9 @@ static const struct cpumask *cpumask_of_node(int node) | |||
28 | { | 28 | { |
29 | int cpu; | 29 | int cpu; |
30 | 30 | ||
31 | if (node == -1) | ||
32 | return cpu_all_mask; | ||
33 | |||
31 | cpumask_clear(&node_to_cpumask_map[node]); | 34 | cpumask_clear(&node_to_cpumask_map[node]); |
32 | 35 | ||
33 | for_each_online_cpu(cpu) { | 36 | for_each_online_cpu(cpu) { |