Author: mjg
Date: Wed Jun 10 12:39:01 2015
New Revision: 284217
URL: https://svnweb.freebsd.org/changeset/base/284217
Log:
Fixup the build after r284215.
Submitted by: Ivan Klymenko <fidaj ukr.net> [slighly modified]
Modified:
head/sys/amd64/linux/linux_machdep.c
head/sys/kern/kern_descrip.c
Modified: head/sys/amd64/linux/linux_machdep.c
==============================================================================
--- head/sys/amd64/linux/linux_machdep.c Wed Jun 10 12:17:19 2015
(r284216)
+++ head/sys/amd64/linux/linux_machdep.c Wed Jun 10 12:39:01 2015
(r284217)
@@ -251,7 +251,7 @@ linux_mmap2(struct thread *td, struct li
*/
PROC_LOCK(p);
p->p_vmspace->vm_maxsaddr = (char *)USRSTACK -
- lim_cur(p, RLIMIT_STACK);
+ lim_cur_proc(p, RLIMIT_STACK);
PROC_UNLOCK(p);
}
Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c Wed Jun 10 12:17:19 2015
(r284216)
+++ head/sys/kern/kern_descrip.c Wed Jun 10 12:39:01 2015
(r284217)
@@ -335,9 +335,9 @@ sys_getdtablesize(struct thread *td, str
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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
