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>

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 4faed6a..29b6930 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -30,17 +30,17 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES];
 
 struct memnode memnode;
 
-unsigned char cpu_to_node[NR_CPUS] __read_mostly = {
+int cpu_to_node_map[NR_CPUS] __read_mostly = {
        [0 ... NR_CPUS-1] = NUMA_NO_NODE
 };
-EXPORT_SYMBOL(cpu_to_node);
+EXPORT_SYMBOL(cpu_to_node_map);
 
 unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
        [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
 };
 
-cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly;
-EXPORT_SYMBOL(node_to_cpumask);
+cpumask_t node_to_cpumask_map[MAX_NUMNODES] __read_mostly;
+EXPORT_SYMBOL(node_to_cpumask_map);
 
 int numa_off __initdata;
 unsigned long __initdata nodemap_addr;
@@ -542,20 +542,20 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
        node_set(0, node_possible_map);
        for (i = 0; i < NR_CPUS; i++)
                numa_set_node(i, 0);
-       node_to_cpumask[0] = cpumask_of_cpu(0);
+       node_to_cpumask_map[0] = cpumask_of_cpu(0);
        e820_register_active_regions(0, start_pfn, end_pfn);
        setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT);
 }
 
 __cpuinit void numa_add_cpu(int cpu)
 {
-       set_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
+       set_bit(cpu, &node_to_cpumask_map[cpu_to_node(cpu)]);
 }
 
 void __cpuinit numa_set_node(int cpu, int node)
 {
        cpu_pda(cpu)->nodenumber = node;
-       cpu_to_node(cpu) = node;
+       cpu_to_node_map[cpu] = node;
 }
 
 unsigned long __init numa_free_all_bootmem(void)

diff --git a/include/asm-x86/numa_64.h b/include/asm-x86/numa_64.h
index e6bc0b5..c3c20db 100644 (file)
--- 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 407b22d..cf52934 100644 (file)
--- 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));