From owner-svn-src-projects@FreeBSD.ORG  Thu Oct  8 21:48:52 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B86E106568F;
	Thu,  8 Oct 2009 21:48:52 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF7658FC23;
	Thu,  8 Oct 2009 21:48:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n98Lmppp034409;
	Thu, 8 Oct 2009 21:48:51 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98Lmpho034407;
	Thu, 8 Oct 2009 21:48:51 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910082148.n98Lmpho034407@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Oct 2009 21:48:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197878 - projects/capabilities8/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 21:48:52 -0000

Author: rwatson
Date: Thu Oct  8 21:48:51 2009
New Revision: 197878
URL: http://svn.freebsd.org/changeset/base/197878

Log:
  Manually merge r197794 from head to capabilities8:
  
    Fix build on amd64, where sysctl arg1 is a pointer.
  
    Reported by:    Mr Tinderbox

Modified:
  projects/capabilities8/sys/kern/uipc_usrreq.c

Modified: projects/capabilities8/sys/kern/uipc_usrreq.c
==============================================================================
--- projects/capabilities8/sys/kern/uipc_usrreq.c	Thu Oct  8 21:47:22 2009	(r197877)
+++ projects/capabilities8/sys/kern/uipc_usrreq.c	Thu Oct  8 21:48:51 2009	(r197878)
@@ -1468,7 +1468,7 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
 		break;
 
 	default:
-		panic("unp_pcblist: arg1 %d", (intptr_t)arg1);
+		panic("unp_pcblist: arg1 %d", (int)(intptr_t)arg1);
 	}
 
 	/*