diff options
| author | alc <alc@FreeBSD.org> | 2010-12-14 05:47:35 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2010-12-14 05:47:35 +0000 |
| commit | fa0943bb62804dbdde4bdee8385a1fb2e13c8a59 (patch) | |
| tree | 8a0b301cf5bd2e3a8d36ec420face17e13d7c5d2 /sys/vm | |
| parent | e89450cac9b4b8c31d12491f35c09ec7af9ac345 (diff) | |
| download | FreeBSD-src-fa0943bb62804dbdde4bdee8385a1fb2e13c8a59.zip FreeBSD-src-fa0943bb62804dbdde4bdee8385a1fb2e13c8a59.tar.gz | |
Change memguard_fudge() so that it can handle km_max being zero. Not
every platform defines VM_KMEM_SIZE_MAX, and on those platforms km_max
will be zero.
Reviewed by: mdf
Tested by: marius
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/memguard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c index 3cf935c..c77f27d 100644 --- a/sys/vm/memguard.c +++ b/sys/vm/memguard.c @@ -184,9 +184,10 @@ memguard_fudge(unsigned long km_size, unsigned long km_max) memguard_mapsize = km_max / vm_memguard_divisor; /* size must be multiple of PAGE_SIZE */ 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; - if (km_size + memguard_mapsize > km_max) + if (km_max > 0 && km_size + memguard_mapsize > km_max) return (km_max); return (km_size + memguard_mapsize); } |
