diff options
| author | trasz <trasz@FreeBSD.org> | 2010-07-27 19:26:18 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2010-07-27 19:26:18 +0000 |
| commit | 9d4312eb1032b9175c263cf16a768371b666f4b6 (patch) | |
| tree | d0e1df76db36f322807de1908747e045c113fc3f /sys/vm | |
| parent | 66bc7530bc816c8aab9a791974bd9946a60600a2 (diff) | |
| download | FreeBSD-src-9d4312eb1032b9175c263cf16a768371b666f4b6.zip FreeBSD-src-9d4312eb1032b9175c263cf16a768371b666f4b6.tar.gz | |
Fix commented out resource limit check in mlockall(2). It's still racy,
but at least less misleading.
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_mmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 3d72123..999a481 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -1082,8 +1082,7 @@ mlockall(td, uap) * a hard resource limit, return ENOMEM. */ PROC_LOCK(td->td_proc); - if (map->size - ptoa(pmap_wired_count(vm_map_pmap(map)) > - lim_cur(td->td_proc, RLIMIT_MEMLOCK))) { + if (map->size > lim_cur(td->td_proc, RLIMIT_MEMLOCK)) { PROC_UNLOCK(td->td_proc); return (ENOMEM); } |
