diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:51:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:51:39 -0800 |
| commit | 9fc819172aa565c7be51f758b7e85301c9df7c70 (patch) | |
| tree | 55bddc16c148257494ce912728422b32d5f96fbb /arch | |
| parent | Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (diff) | |
| parent | alpha: cpumask_of_node() should handle -1 as a node (diff) | |
| download | linux-dev-9fc819172aa565c7be51f758b7e85301c9df7c70.tar.xz linux-dev-9fc819172aa565c7be51f758b7e85301c9df7c70.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/include/asm/topology.h | 3 |
1 files changed, 3 insertions, 0 deletions
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) { int cpu; + if (node == -1) + return cpu_all_mask; + cpumask_clear(&node_to_cpumask_map[node]); for_each_online_cpu(cpu) { |