cpumask: use new cpumask functions throughout x86

[linux-2.6-block.git] / arch / x86 / include / asm / topology.h

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index f8b833e1257ff0776221dd091c1e6b8ac6e5586b..1ce1e1afa801ad85c3cfd100e800428d89f19c0e 100644 (file)
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -174,11 +174,11 @@ static inline int early_cpu_to_node(int cpu)
 
 static inline const cpumask_t *cpumask_of_node(int node)
 {
-       return &cpu_online_map;
+       return cpu_online_mask;
 }
 static inline int node_to_first_cpu(int node)
 {
-       return first_cpu(cpu_online_map);
+       return cpumask_first(cpu_online_mask);
 }
 
 static inline void setup_node_to_cpumask_map(void) { }