diff options
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
-rw-r--r-- | arch/x86/kernel/setup_percpu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index ae0c0d3bb770..8e8b1193add5 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -282,7 +282,7 @@ static void __cpuinit numa_set_cpumask(int cpu, int enable) | |||
282 | else | 282 | else |
283 | cpu_clear(cpu, *mask); | 283 | cpu_clear(cpu, *mask); |
284 | 284 | ||
285 | cpulist_scnprintf(buf, sizeof(buf), *mask); | 285 | cpulist_scnprintf(buf, sizeof(buf), mask); |
286 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", | 286 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", |
287 | enable? "numa_add_cpu":"numa_remove_cpu", cpu, node, buf); | 287 | enable? "numa_add_cpu":"numa_remove_cpu", cpu, node, buf); |
288 | } | 288 | } |
@@ -334,25 +334,25 @@ static const cpumask_t cpu_mask_none; | |||
334 | /* | 334 | /* |
335 | * Returns a pointer to the bitmask of CPUs on Node 'node'. | 335 | * Returns a pointer to the bitmask of CPUs on Node 'node'. |
336 | */ | 336 | */ |
337 | const cpumask_t *_node_to_cpumask_ptr(int node) | 337 | const cpumask_t *cpumask_of_node(int node) |
338 | { | 338 | { |
339 | if (node_to_cpumask_map == NULL) { | 339 | if (node_to_cpumask_map == NULL) { |
340 | printk(KERN_WARNING | 340 | printk(KERN_WARNING |
341 | "_node_to_cpumask_ptr(%d): no node_to_cpumask_map!\n", | 341 | "cpumask_of_node(%d): no node_to_cpumask_map!\n", |
342 | node); | 342 | node); |
343 | dump_stack(); | 343 | dump_stack(); |
344 | return (const cpumask_t *)&cpu_online_map; | 344 | return (const cpumask_t *)&cpu_online_map; |
345 | } | 345 | } |
346 | if (node >= nr_node_ids) { | 346 | if (node >= nr_node_ids) { |
347 | printk(KERN_WARNING | 347 | printk(KERN_WARNING |
348 | "_node_to_cpumask_ptr(%d): node > nr_node_ids(%d)\n", | 348 | "cpumask_of_node(%d): node > nr_node_ids(%d)\n", |
349 | node, nr_node_ids); | 349 | node, nr_node_ids); |
350 | dump_stack(); | 350 | dump_stack(); |
351 | return &cpu_mask_none; | 351 | return &cpu_mask_none; |
352 | } | 352 | } |
353 | return &node_to_cpumask_map[node]; | 353 | return &node_to_cpumask_map[node]; |
354 | } | 354 | } |
355 | EXPORT_SYMBOL(_node_to_cpumask_ptr); | 355 | EXPORT_SYMBOL(cpumask_of_node); |
356 | 356 | ||
357 | /* | 357 | /* |
358 | * Returns a bitmask of CPUs on Node 'node'. | 358 | * Returns a bitmask of CPUs on Node 'node'. |