diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/alpha | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'arch/alpha')
| -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) | |||
| 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) { |