diff options
author | Mike Travis <travis@sgi.com> | 2008-05-12 15:21:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:31:24 -0400 |
commit | 9f248bde9d47cc177011198c9a15fb339b9f3215 (patch) | |
tree | a6bb5bff1d8d786370b061eeb0958b413b941d41 /arch/x86/mm/numa_64.c | |
parent | 7891a24e1ee50c96896c0cf7da216a8e7b573ca5 (diff) |
x86: remove the static 256k node_to_cpumask_map
* Consolidate node_to_cpumask operations and remove the 256k
byte node_to_cpumask_map. This is done by allocating the
node_to_cpumask_map array after the number of possible nodes
(nr_node_ids) is known.
* Debug printouts when CONFIG_DEBUG_PER_CPU_MAPS is active have
been increased. It now shows faults when calling node_to_cpumask()
and node_to_cpumask_ptr().
For inclusion into sched-devel/latest tree.
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+ sched-devel/latest .../mingo/linux-2.6-sched-devel.git
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/numa_64.c')
-rw-r--r-- | arch/x86/mm/numa_64.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 970f86775c41..14c7ab417ec7 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -35,9 +35,6 @@ s16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { | |||
35 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE | 35 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE |
36 | }; | 36 | }; |
37 | 37 | ||
38 | cpumask_t node_to_cpumask_map[MAX_NUMNODES] __read_mostly; | ||
39 | EXPORT_SYMBOL(node_to_cpumask_map); | ||
40 | |||
41 | int numa_off __initdata; | 38 | int numa_off __initdata; |
42 | unsigned long __initdata nodemap_addr; | 39 | unsigned long __initdata nodemap_addr; |
43 | unsigned long __initdata nodemap_size; | 40 | unsigned long __initdata nodemap_size; |
@@ -560,9 +557,6 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) | |||
560 | node_set(0, node_possible_map); | 557 | node_set(0, node_possible_map); |
561 | for (i = 0; i < NR_CPUS; i++) | 558 | for (i = 0; i < NR_CPUS; i++) |
562 | numa_set_node(i, 0); | 559 | numa_set_node(i, 0); |
563 | /* cpumask_of_cpu() may not be available during early startup */ | ||
564 | memset(&node_to_cpumask_map[0], 0, sizeof(node_to_cpumask_map[0])); | ||
565 | cpu_set(0, node_to_cpumask_map[0]); | ||
566 | e820_register_active_regions(0, start_pfn, end_pfn); | 560 | e820_register_active_regions(0, start_pfn, end_pfn); |
567 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT); | 561 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT); |
568 | } | 562 | } |