summaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm/init.c
diff options
context:
space:
mode:
authorbob.picco <bob.picco@hp.com>2005-06-30 09:52:00 -0700
committerTony Luck <tony.luck@intel.com>2005-07-06 15:45:30 -0700
commit564601a5d12f93fdde04c6bc5b097b95e7752a46 (patch)
tree7ecd89b4eea6c626eb0726a5f7cf16e6e0f93b6e /arch/ia64/mm/init.c
parentaf25e94d4dcfb9608846242fabdd4e6014e5c9f0 (diff)
downloadlinux-564601a5d12f93fdde04c6bc5b097b95e7752a46.tar.gz
linux-564601a5d12f93fdde04c6bc5b097b95e7752a46.tar.bz2
linux-564601a5d12f93fdde04c6bc5b097b95e7752a46.zip
[IA64] memory-less-nodes repost
I reworked how nodes with only CPUs are treated. The patch below seems simpler to me and has eliminated the complicated routine reassign_cpu_only_nodes. There isn't any longer the requirement to modify ACPI NUMA information which was in large part the complexity introduced in reassign_cpu_only_nodes. This patch will produce a different number of nodes. For example, reassign_cpu_only_nodes would reduce two CPUonly nodes and one memory node configuration to one memory+CPUs node configuration. This patch doesn't change the number of nodes which means the user will see three. Two nodes without memory and one node with all the memory. While doing this patch, I noticed that early_nr_phys_cpus_node isn't serving any useful purpose. It is called once in find_pernode_space but the value isn't used to computer pernode space. Signed-off-by: bob.picco <bob.picco@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm/init.c')
-rw-r--r--arch/ia64/mm/init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 4eb2f52b87a1..65f9958db9f0 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -597,7 +597,8 @@ mem_init (void)
kclist_add(&kcore_kernel, _stext, _end - _stext);
for_each_pgdat(pgdat)
- totalram_pages += free_all_bootmem_node(pgdat);
+ if (pgdat->bdata->node_bootmem_map)
+ totalram_pages += free_all_bootmem_node(pgdat);
reserved_pages = 0;
efi_memmap_walk(count_reserved_pages, &reserved_pages);