From owner-svn-src-stable@FreeBSD.ORG  Sun May 12 09:42:18 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 903678BF;
 Sun, 12 May 2013 09:42:18 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 814CA2C2;
 Sun, 12 May 2013 09:42:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4C9gHpr035727;
 Sun, 12 May 2013 09:42:17 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4C9gHHs035726;
 Sun, 12 May 2013 09:42:17 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201305120942.r4C9gHHs035726@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Sun, 12 May 2013 09:42:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r250558 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 09:42:18 -0000

Author: jh
Date: Sun May 12 09:42:17 2013
New Revision: 250558
URL: http://svnweb.freebsd.org/changeset/base/250558

Log:
  MFC r249650:
  
  Include PID in the error message which is printed when the maxproc limit
  is exceeded. Improve formatting of the message while here.
  
  PR:		kern/60550

Modified:
  stable/9/sys/kern/kern_fork.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_fork.c
==============================================================================
--- stable/9/sys/kern/kern_fork.c	Sun May 12 09:33:33 2013	(r250557)
+++ stable/9/sys/kern/kern_fork.c	Sun May 12 09:42:17 2013	(r250558)
@@ -929,8 +929,8 @@ fork1(struct thread *td, int flags, int 
 fail:
 	sx_sunlock(&proctree_lock);
 	if (ppsratecheck(&lastfail, &curfail, 1))
-		printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n",
-		    td->td_ucred->cr_ruid);
+		printf("maxproc limit exceeded by uid %u (pid %d); see tuning(7) and login.conf(5)\n",
+		    td->td_ucred->cr_ruid, p1->p_pid);
 	sx_xunlock(&allproc_lock);
 #ifdef MAC
 	mac_proc_destroy(newproc);