diff options
author | Vegard Nossum <vegard.nossum@gmail.com> | 2008-06-06 10:33:25 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:31:31 -0400 |
commit | 03db1f74a7d823e3de3767f36b1e08829f6fb3a1 (patch) | |
tree | f2b8e0025adc7383f79c6a861cad04b19d308db8 /arch/x86/kernel/setup.c | |
parent | 076ac2af86c3b7f89ac31bc50a7508d3e035b786 (diff) |
x86: don't return invalid pointers from node_to_cpumask()
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index dd12c1c84a8f..df49ce87a300 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -350,6 +350,7 @@ cpumask_t *_node_to_cpumask_ptr(int node) | |||
350 | dump_stack(); | 350 | dump_stack(); |
351 | return &cpu_online_map; | 351 | return &cpu_online_map; |
352 | } | 352 | } |
353 | BUG_ON(node >= nr_node_ids); | ||
353 | return &node_to_cpumask_map[node]; | 354 | return &node_to_cpumask_map[node]; |
354 | } | 355 | } |
355 | EXPORT_SYMBOL(_node_to_cpumask_ptr); | 356 | EXPORT_SYMBOL(_node_to_cpumask_ptr); |
@@ -365,6 +366,7 @@ cpumask_t node_to_cpumask(int node) | |||
365 | dump_stack(); | 366 | dump_stack(); |
366 | return cpu_online_map; | 367 | return cpu_online_map; |
367 | } | 368 | } |
369 | BUG_ON(node >= nr_node_ids); | ||
368 | return node_to_cpumask_map[node]; | 370 | return node_to_cpumask_map[node]; |
369 | } | 371 | } |
370 | EXPORT_SYMBOL(node_to_cpumask); | 372 | EXPORT_SYMBOL(node_to_cpumask); |