From owner-svn-src-head@FreeBSD.ORG  Wed Jun 10 12:39:02 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2A749EB6;
 Wed, 10 Jun 2015 12:39:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 185B413D9;
 Wed, 10 Jun 2015 12:39:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5ACd1nL084519;
 Wed, 10 Jun 2015 12:39:01 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5ACd1mf084513;
 Wed, 10 Jun 2015 12:39:01 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201506101239.t5ACd1mf084513@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Wed, 10 Jun 2015 12:39:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284217 - in head/sys: amd64/linux kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2015 12:39:02 -0000

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