X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-alpha%2Ftopology.h;h=420ccde6b916a31f8d601d46e601a3062bfc658b;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=65a6a2e8b6a1c661da34d9cfed5245151f76004c;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h
index 65a6a2e8b..420ccde6b 100644
--- a/include/asm-alpha/topology.h
+++ b/include/asm-alpha/topology.h
@@ -22,25 +22,24 @@ static inline int cpu_to_node(int cpu)
 	return node;
 }
 
-static inline int node_to_cpumask(int node)
+static inline cpumask_t node_to_cpumask(int node)
 {
-	unsigned long node_cpu_mask = 0;
+	cpumask_t node_cpu_mask = CPU_MASK_NONE;
 	int cpu;
 
-	for(cpu = 0; cpu < NR_CPUS; cpu++) {
-		if (cpu_online(cpu) && (cpu_to_node(cpu) == node))
-			node_cpu_mask |= 1UL << cpu;
+	for_each_online_cpu(cpu) {
+		if (cpu_to_node(cpu) == node)
+			cpu_set(cpu, node_cpu_mask);
 	}
 
-#if DEBUG_NUMA
+#ifdef DEBUG_NUMA
 	printk("node %d: cpu_mask: %016lx\n", node, node_cpu_mask);
 #endif
 
 	return node_cpu_mask;
 }
 
-/* Cross-node load balancing interval. */
-# define NODE_BALANCE_RATE 10
+#define pcibus_to_cpumask(bus)	(cpu_online_map)
 
 #else /* CONFIG_NUMA */
 # include <asm-generic/topology.h>