diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:38 +0100 |
| commit | 7462894a7cb03b54b9139f31fab5928366752a78 (patch) | |
| tree | c524bba53a1d76fe30f4b718308acb98eb58fd06 /include | |
| parent | e3cfe529dd87dd3354789546676fef2e808822e4 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/numa_64.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/topology_64.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-x86/numa_64.h b/include/asm-x86/numa_64.h index e6bc0b5dfe3..c3c20db1fba 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 407b22d4e3b..cf529341b16 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)); |