diff options
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/numa_64.c | 4 | ||||
-rw-r--r-- | arch/x86/mm/srat_64.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 93847d848157..5684e5a1282b 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -289,7 +289,7 @@ static void __cpuinit vsyscall_set_cpu(int cpu) | |||
289 | unsigned long *d; | 289 | unsigned long *d; |
290 | unsigned long node = 0; | 290 | unsigned long node = 0; |
291 | #ifdef CONFIG_NUMA | 291 | #ifdef CONFIG_NUMA |
292 | node = cpu_to_node[cpu]; | 292 | node = cpu_to_node(cpu); |
293 | #endif | 293 | #endif |
294 | if (cpu_has(&cpu_data[cpu], X86_FEATURE_RDTSCP)) | 294 | if (cpu_has(&cpu_data[cpu], X86_FEATURE_RDTSCP)) |
295 | write_rdtscp_aux((node << 12) | cpu); | 295 | write_rdtscp_aux((node << 12) | cpu); |
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 97e8ac75568f..5eec5e56d07f 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -261,7 +261,7 @@ void __init numa_init_array(void) | |||
261 | We round robin the existing nodes. */ | 261 | We round robin the existing nodes. */ |
262 | rr = first_node(node_online_map); | 262 | rr = first_node(node_online_map); |
263 | for (i = 0; i < NR_CPUS; i++) { | 263 | for (i = 0; i < NR_CPUS; i++) { |
264 | if (cpu_to_node[i] != NUMA_NO_NODE) | 264 | if (cpu_to_node(i) != NUMA_NO_NODE) |
265 | continue; | 265 | continue; |
266 | numa_set_node(i, rr); | 266 | numa_set_node(i, rr); |
267 | rr = next_node(rr, node_online_map); | 267 | rr = next_node(rr, node_online_map); |
@@ -543,7 +543,7 @@ __cpuinit void numa_add_cpu(int cpu) | |||
543 | void __cpuinit numa_set_node(int cpu, int node) | 543 | void __cpuinit numa_set_node(int cpu, int node) |
544 | { | 544 | { |
545 | cpu_pda(cpu)->nodenumber = node; | 545 | cpu_pda(cpu)->nodenumber = node; |
546 | cpu_to_node[cpu] = node; | 546 | cpu_to_node(cpu) = node; |
547 | } | 547 | } |
548 | 548 | ||
549 | unsigned long __init numa_free_all_bootmem(void) | 549 | unsigned long __init numa_free_all_bootmem(void) |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index acdf03e19146..56089ccc3949 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
@@ -431,9 +431,9 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) | |||
431 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); | 431 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); |
432 | 432 | ||
433 | for (i = 0; i < NR_CPUS; i++) { | 433 | for (i = 0; i < NR_CPUS; i++) { |
434 | if (cpu_to_node[i] == NUMA_NO_NODE) | 434 | if (cpu_to_node(i) == NUMA_NO_NODE) |
435 | continue; | 435 | continue; |
436 | if (!node_isset(cpu_to_node[i], node_possible_map)) | 436 | if (!node_isset(cpu_to_node(i), node_possible_map)) |
437 | numa_set_node(i, NUMA_NO_NODE); | 437 | numa_set_node(i, NUMA_NO_NODE); |
438 | } | 438 | } |
439 | numa_init_array(); | 439 | numa_init_array(); |