From 30a908607bd75f39b1c56f8a3c73bb7f5f19c8a9 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 8 May 2006 22:04:40 +0000 Subject: 2006-05-08 Thomas Schwinge * DEVELOPMENT: Document Samuel's patch. 2006-05-08 Samuel Thibault * i386/i386at/model_dep.c (mem_size_init): Limit memory to what can actually be used (minus a little extra for virtual mappings). * i386/intel/pmap.c (pmap_bootstrap): Extend the virtual mapping area according to memory size for at least being able to manage it. But look out for wrap and limit it to kernel adresses. Remove duplicate computing. --- i386/intel/pmap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'i386/intel') diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c index fc56e87..540070b 100644 --- a/i386/intel/pmap.c +++ b/i386/intel/pmap.c @@ -627,7 +627,12 @@ void pmap_bootstrap() * and extends to a stupid arbitrary limit beyond that. */ kernel_virtual_start = phys_last_addr; - kernel_virtual_end = phys_last_addr + morevm; + kernel_virtual_end = phys_last_addr + morevm + + (phys_last_addr - phys_first_addr) / 15; + + if (kernel_virtual_end < phys_last_addr + || kernel_virtual_end > VM_MAX_KERNEL_ADDRESS) + kernel_virtual_end = VM_MAX_KERNEL_ADDRESS; /* * Allocate and clear a kernel page directory. @@ -656,7 +661,7 @@ void pmap_bootstrap() * to allocate new kernel page tables later. * XX fix this */ - for (va = phys_first_addr; va < phys_last_addr + morevm; ) + for (va = phys_first_addr; va < kernel_virtual_end; ) { pt_entry_t *pde = kernel_page_dir + lin2pdenum(kvtolin(va)); pt_entry_t *ptable = (pt_entry_t*)pmap_grab_page(); -- cgit v1.2.3