x86: fixup numa 64 namespace

Using a variable name, which is the same as a macro name is not
really smart. Change the variable names and fixup all users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 6 insertions, 6 deletions

diff --git a/include/asm-x86/numa_64.h b/include/asm-x86/numa_64.h
index e6bc0b5dfe3a..c3c20db1fba3 100644
--- a/include/asm-x86/numa_64.h
+++ b/include/asm-x86/numa_64.h
@@ -32,7 +32,7 @@ extern void __init init_cpu_to_node(void);
 
 static inline void clear_node_cpumask(int cpu)
 {
-        clear_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
+        clear_bit(cpu, &node_to_cpumask_map[cpu_to_node(cpu)]);
 }
 
 #else
diff --git a/include/asm-x86/topology_64.h b/include/asm-x86/topology_64.h
index 407b22d4e3b0..cf529341b16c 100644
--- a/include/asm-x86/topology_64.h
+++ b/include/asm-x86/topology_64.h
@@ -7,8 +7,8 @@
 #include <asm/mpspec.h>
 #include <linux/bitops.h>
 
-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);
@@ -16,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));