diff options
Diffstat (limited to 'include/asm-x86/topology_64.h')
-rw-r--r-- | include/asm-x86/topology_64.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ | |||
7 | #include <asm/mpspec.h> | 7 | #include <asm/mpspec.h> |
8 | #include <linux/bitops.h> | 8 | #include <linux/bitops.h> |
9 | 9 | ||
10 | extern unsigned char cpu_to_node[]; | 10 | extern int cpu_to_node_map[]; |
11 | extern cpumask_t node_to_cpumask[]; | 11 | extern cpumask_t node_to_cpumask_map[]; |
12 | 12 | ||
13 | #ifdef CONFIG_ACPI_NUMA | 13 | #ifdef CONFIG_ACPI_NUMA |
14 | extern int __node_distance(int, int); | 14 | extern int __node_distance(int, int); |
@@ -16,10 +16,10 @@ extern int __node_distance(int, int); | |||
16 | /* #else fallback version */ | 16 | /* #else fallback version */ |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | #define cpu_to_node(cpu) (cpu_to_node[cpu]) | 19 | #define cpu_to_node(cpu) (cpu_to_node_map[cpu]) |
20 | #define parent_node(node) (node) | 20 | #define parent_node(node) (node) |
21 | #define node_to_first_cpu(node) (first_cpu(node_to_cpumask[node])) | 21 | #define node_to_first_cpu(node) (first_cpu(node_to_cpumask_map[node])) |
22 | #define node_to_cpumask(node) (node_to_cpumask[node]) | 22 | #define node_to_cpumask(node) (node_to_cpumask_map[node]) |
23 | #define pcibus_to_node(bus) ((struct pci_sysdata *)((bus)->sysdata))->node | 23 | #define pcibus_to_node(bus) ((struct pci_sysdata *)((bus)->sysdata))->node |
24 | #define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus)); | 24 | #define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus)); |
25 | 25 | ||