d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change memguard_fudge() so that it can handle km_max being zero. Not

Browse Source 
every platform defines VM_KMEM_SIZE_MAX, and on those platforms km_max
will be zero.

Reviewed by:	mdf
Tested by:	marius
This commit is contained in:
Alan Cox 2010-12-14 05:47:35 +00:00
parent 69be0c5ea2
commit 7984ab250b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/vm/memguard.c
View File

@ -184,9 +184,10 @@ memguard_fudge(unsigned long km_size, unsigned long km_max)
memguard_mapsize = km_max / vm_memguard_divisor; memguard_mapsize = km_max / vm_memguard_divisor;
/* size must be multiple of PAGE_SIZE */ /* size must be multiple of PAGE_SIZE */
memguard_mapsize = round_page(memguard_mapsize); memguard_mapsize = round_page(memguard_mapsize);
if (memguard_mapsize / (2 * PAGE_SIZE) > mem_pgs) if (memguard_mapsize == 0 ||
memguard_mapsize / (2 * PAGE_SIZE) > mem_pgs)
memguard_mapsize = mem_pgs * 2 * PAGE_SIZE; memguard_mapsize = mem_pgs * 2 * PAGE_SIZE;
if (km_size + memguard_mapsize > km_max) if (km_max > 0 && km_size + memguard_mapsize > km_max)
return (km_max); return (km_max);
return (km_size + memguard_mapsize); return (km_size + memguard_mapsize);
} }