diff options
| author | mjg <mjg@FreeBSD.org> | 2015-06-10 12:39:01 +0000 |
|---|---|---|
| committer | mjg <mjg@FreeBSD.org> | 2015-06-10 12:39:01 +0000 |
| commit | b6be1c5ace6f352e4f44e0ef31ed744b19658c5e (patch) | |
| tree | 5790bebf502ab1410ed7a323782108ec1a683ce3 | |
| parent | d7bc9285a673d676370f95a84ce93ef553c8688c (diff) | |
| download | FreeBSD-src-b6be1c5ace6f352e4f44e0ef31ed744b19658c5e.zip FreeBSD-src-b6be1c5ace6f352e4f44e0ef31ed744b19658c5e.tar.gz | |
Fixup the build after r284215.
Submitted by: Ivan Klymenko <fidaj ukr.net> [slighly modified]
| -rw-r--r-- | sys/amd64/linux/linux_machdep.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_descrip.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index d6174e6..451e4b4 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -251,7 +251,7 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *args) */ PROC_LOCK(p); p->p_vmspace->vm_maxsaddr = (char *)USRSTACK - - lim_cur(p, RLIMIT_STACK); + lim_cur_proc(p, RLIMIT_STACK); PROC_UNLOCK(p); } diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index d16f3f9..f6f8194 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -335,9 +335,9 @@ sys_getdtablesize(struct thread *td, struct getdtablesize_args *uap) td->td_retval[0] = min((int)lim_cur(td, RLIMIT_NOFILE), maxfilesperproc); #ifdef RACCT - PROC_LOCK(p); + PROC_LOCK(td->td_proc); lim = racct_get_limit(td->td_proc, RACCT_NOFILE); - PROC_UNLOCK(p); + PROC_UNLOCK(td->td_proc); if (lim < td->td_retval[0]) td->td_retval[0] = lim; #endif |
