Merge branch 'master' into percpu

2010-02-02 14:38:15 +09:00
parent dbfc196a3c ab658321f3
commit ab386128f2
1258 changed files with 33261 additions and 12809 deletions
--- 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) {