x86: fixup numa 64 namespace

[powerpc.git] / include / asm-x86 / topology_64.h

diff --git a/include/asm-x86/topology_64.h b/include/asm-x86/topology_64.h
index 848c17f..cf52934 100644 (file)
--- a/include/asm-x86/topology_64.h
+++ b/include/asm-x86/topology_64.h
@@ -5,12 +5,10 @@
 #ifdef CONFIG_NUMA
 
 #include <asm/mpspec.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
-extern cpumask_t cpu_online_map;
-
-extern unsigned char cpu_to_node[];
-extern cpumask_t     node_to_cpumask[];
+extern int cpu_to_node_map[];
+extern cpumask_t node_to_cpumask_map[];
 
 #ifdef CONFIG_ACPI_NUMA
 extern int __node_distance(int, int);
@@ -18,10 +16,10 @@ extern int __node_distance(int, int);
 /* #else fallback version */
 #endif
 
-#define cpu_to_node(cpu)               (cpu_to_node[cpu])
+#define cpu_to_node(cpu)               (cpu_to_node_map[cpu])
 #define parent_node(node)              (node)
-#define node_to_first_cpu(node)        (first_cpu(node_to_cpumask[node]))
-#define node_to_cpumask(node)          (node_to_cpumask[node])
+#define node_to_first_cpu(node)                (first_cpu(node_to_cpumask_map[node]))
+#define node_to_cpumask(node)          (node_to_cpumask_map[node])
 #define pcibus_to_node(bus)    ((struct pci_sysdata *)((bus)->sysdata))->node
 #define pcibus_to_cpumask(bus)         node_to_cpumask(pcibus_to_node(bus));
 
@@ -56,8 +54,8 @@ extern int __node_distance(int, int);
 #endif
 
 #ifdef CONFIG_SMP
-#define topology_physical_package_id(cpu)      (cpu_data[cpu].phys_proc_id)
-#define topology_core_id(cpu)                  (cpu_data[cpu].cpu_core_id)
+#define topology_physical_package_id(cpu)      (cpu_data(cpu).phys_proc_id)
+#define topology_core_id(cpu)                  (cpu_data(cpu).cpu_core_id)
 #define topology_core_siblings(cpu)            (per_cpu(cpu_core_map, cpu))
 #define topology_thread_siblings(cpu)          (per_cpu(cpu_sibling_map, cpu))
 #define mc_capable()                   (boot_cpu_data.x86_max_cores > 1)