60c60
< __FBSDID("$FreeBSD: head/sys/vm/vm_glue.c 217192 2011-01-09 12:50:44Z kib $");
---
> __FBSDID("$FreeBSD: head/sys/vm/vm_glue.c 220373 2011-04-05 20:23:59Z trasz $");
71a72
> #include <sys/racct.h>
184a186
> unsigned long nsize;
197,199c199,201
< if (ptoa(npages +
< pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))) >
< lim_cur(curproc, RLIMIT_MEMLOCK)) {
---
> nsize = ptoa(npages +
> pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map)));
> if (nsize > lim_cur(curproc, RLIMIT_MEMLOCK)) {
202a205,208
> if (racct_set(curproc, RACCT_MEMLOCK, nsize)) {
> PROC_UNLOCK(curproc);
> return (ENOMEM);
> }
218a225,230
> if (error != KERN_SUCCESS) {
> PROC_LOCK(curproc);
> racct_set(curproc, RACCT_MEMLOCK,
> ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
> PROC_UNLOCK(curproc);
> }
233a246,250
>
> PROC_LOCK(curproc);
> racct_set(curproc, RACCT_MEMLOCK,
> ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
> PROC_UNLOCK(curproc);