diff options
Diffstat (limited to 'arch/x86/mm/numa_64.c')
-rw-r--r-- | arch/x86/mm/numa_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 6da235522269..5eec5e56d07f 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -166,7 +166,7 @@ early_node_mem(int nodeid, unsigned long start, unsigned long end, | |||
166 | return __va(mem); | 166 | return __va(mem); |
167 | ptr = __alloc_bootmem_nopanic(size, | 167 | ptr = __alloc_bootmem_nopanic(size, |
168 | SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)); | 168 | SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)); |
169 | if (ptr == 0) { | 169 | if (ptr == NULL) { |
170 | printk(KERN_ERR "Cannot find %lu bytes in node %d\n", | 170 | printk(KERN_ERR "Cannot find %lu bytes in node %d\n", |
171 | size, nodeid); | 171 | size, nodeid); |
172 | return NULL; | 172 | return NULL; |
@@ -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) |