diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-26 06:53:38 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-26 06:53:38 -0500 |
commit | 393d68fb9929817cde7ab31c82d66fcb28ad35fc (patch) | |
tree | 8174698205c9a5ff8f063d0bc0f5a6b80d3b1a5f /arch/x86/kernel/setup_percpu.c | |
parent | d62720ade82c5e5b8f9585e5ed02c89573ebf111 (diff) |
cpumask: x86: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask
Impact: New APIs
The old node_to_cpumask/node_to_pcibus returned a cpumask_t: these
return a pointer to a struct cpumask. Part of removing cpumasks from
the stack.
Also makes __pcibus_to_node take a const pointer.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
-rw-r--r-- | arch/x86/kernel/setup_percpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 1c2084291f97..8e8b1193add5 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -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'. |