diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 22:51:39 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 22:51:39 (GMT) |
| commit | 9fc819172aa565c7be51f758b7e85301c9df7c70 (patch) | |
| tree | 55bddc16c148257494ce912728422b32d5f96fbb | |
| parent | 933a42b1842d0b7bc7e4e16f2f5f1099e72870d4 (diff) | |
| parent | 44c36aed43b57ea12140957bebe76d711fbed653 (diff) | |
| download | linux-fsl-qoriq-9fc819172aa565c7be51f758b7e85301c9df7c70.tar.xz | |
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 c8f47bf..3f59162 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -410,9 +410,8 @@ F: drivers/i2c/busses/i2c-ali1563.c ALPHA PORT M: Richard Henderson <rth@twiddle.net> -S: Odd Fixes for 2.4; Maintained for 2.6. M: Ivan Kokshaysky <ink@jurassic.park.msu.ru> -S: Maintained for 2.4; PCI support for 2.6. +M: Matt Turner <mattst88@gmail.com> L: linux-alpha@vger.kernel.org F: arch/alpha/ diff --git a/arch/alpha/include/asm/topology.h b/arch/alpha/include/asm/topology.h index 36b3a30..9251e13 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) { int cpu; + if (node == -1) + return cpu_all_mask; + cpumask_clear(&node_to_cpumask_map[node]); for_each_online_cpu(cpu) { |