vserver 1.9.3

[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 dbc3f15..84f24e7 100644 (file)
--- a/include/asm-x86_64/topology.h
+++ b/include/asm-x86_64/topology.h
@@ -14,18 +14,23 @@ extern cpumask_t cpu_online_map;
 
 extern unsigned char cpu_to_node[];
 extern cpumask_t     node_to_cpumask[];
+extern cpumask_t pci_bus_to_cpumask[];
 
 #define cpu_to_node(cpu)               (cpu_to_node[cpu])
 #define parent_node(node)              (node)
 #define node_to_first_cpu(node)        (__ffs(node_to_cpumask[node]))
 #define node_to_cpumask(node)          (node_to_cpumask[node])
 
-static inline cpumask_t pcibus_to_cpumask(int bus)
+static inline cpumask_t __pcibus_to_cpumask(int bus)
 {
+       cpumask_t busmask = pci_bus_to_cpumask[bus];
+       cpumask_t online = cpu_online_map;
        cpumask_t res;
-       cpus_and(res,  pci_bus_to_cpumask[bus], cpu_online_map);
+       cpus_and(res, busmask, online);
        return res;
 }
+/* broken generic file uses #ifndef later on this */
+#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
 
 #define NODE_BALANCE_RATE 30   /* CHECKME */