svn commit: r219063 - stable/8/sys/vm
Alan Cox
alc at FreeBSD.org
Sat Feb 26 21:08:10 UTC 2011
Author: alc
Date: Sat Feb 26 21:08:09 2011
New Revision: 219063
URL: http://svn.freebsd.org/changeset/base/219063
Log:
MFC r216090
Correct an error in the allocation of the vm_page_dump array in
vm_page_startup(). Specifically, the dump_avail array should be used
instead of the phys_avail array to calculate the size of vm_page_dump.
Modified:
stable/8/sys/vm/vm_page.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/vm/vm_page.c
==============================================================================
--- stable/8/sys/vm/vm_page.c Sat Feb 26 20:04:14 2011 (r219062)
+++ stable/8/sys/vm/vm_page.c Sat Feb 26 21:08:09 2011 (r219063)
@@ -220,7 +220,6 @@ vm_page_startup(vm_offset_t vaddr)
vm_paddr_t new_end;
int i;
vm_paddr_t pa;
- int nblocks;
vm_paddr_t last_pa;
char *list;
@@ -232,7 +231,6 @@ vm_page_startup(vm_offset_t vaddr)
biggestsize = 0;
biggestone = 0;
- nblocks = 0;
vaddr = round_page(vaddr);
for (i = 0; phys_avail[i + 1]; i += 2) {
@@ -254,7 +252,6 @@ vm_page_startup(vm_offset_t vaddr)
low_water = phys_avail[i];
if (phys_avail[i + 1] > high_water)
high_water = phys_avail[i + 1];
- ++nblocks;
}
#ifdef XEN
@@ -305,7 +302,11 @@ vm_page_startup(vm_offset_t vaddr)
* minidump code. In theory, they are not needed on i386, but are
* included should the sf_buf code decide to use them.
*/
- page_range = phys_avail[(nblocks - 1) * 2 + 1] / PAGE_SIZE;
+ last_pa = 0;
+ for (i = 0; dump_avail[i + 1] != 0; i += 2)
+ if (dump_avail[i + 1] > last_pa)
+ last_pa = dump_avail[i + 1];
+ page_range = last_pa / PAGE_SIZE;
vm_page_dump_size = round_page(roundup2(page_range, NBBY) / NBBY);
new_end -= vm_page_dump_size;
vm_page_dump = (void *)(uintptr_t)pmap_map(&vaddr, new_end,
More information about the svn-src-stable-8
mailing list