Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / include / asm-x86_64 / topology.h

diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h
index bb9a99b..9310f9a 100644 (file)
--- a/include/asm-x86_64/topology.h
+++ b/include/asm-x86_64/topology.h
@@ -20,9 +20,11 @@ extern cpumask_t     node_to_cpumask[];
 #define node_to_first_cpu(node)        (__ffs(node_to_cpumask[node]))
 #define node_to_cpumask(node)          (node_to_cpumask[node])
 
-static inline unsigned long pcibus_to_cpumask(int bus)
+static inline cpumask_t pcibus_to_cpumask(int bus)
 {
-       return mp_bus_to_cpumask[bus] & cpu_online_map; 
+       cpumask_t tmp;
+       cpus_and(tmp, mp_bus_to_cpumask[bus], cpu_online_map);
+       return tmp;
 }
 
 #define NODE_BALANCE_RATE 30   /* CHECKME */