From owner-svn-src-user@FreeBSD.ORG  Sun Jun 28 02:23:52 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 174D31065670;
	Sun, 28 Jun 2009 02:23:52 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B21888FC12;
	Sun, 28 Jun 2009 02:23:51 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5S2Npcn094795;
	Sun, 28 Jun 2009 02:23:51 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5S2NpSB094793;
	Sun, 28 Jun 2009 02:23:51 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906280223.n5S2NpSB094793@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 28 Jun 2009 02:23:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195130 - user/kmacy/releng_7_2_fcs/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2009 02:23:52 -0000

Author: kmacy
Date: Sun Jun 28 02:23:51 2009
New Revision: 195130
URL: http://svn.freebsd.org/changeset/base/195130

Log:
  make tryrelock_calls 64-bit to avoid wrapping

Modified:
  user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Sat Jun 27 23:28:56 2009	(r195129)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Sun Jun 28 02:23:51 2009	(r195130)
@@ -204,8 +204,8 @@ static int pg_ps_enabled;
 SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0,
     "Are large page mappings enabled?");
 
-static int pmap_tryrelock_calls;
-SYSCTL_INT(_vm_pmap, OID_AUTO, tryrelock_calls, CTLFLAG_RD,
+static uint64_t pmap_tryrelock_calls;
+SYSCTL_QUAD(_vm_pmap, OID_AUTO, tryrelock_calls, CTLFLAG_RD,
     &pmap_tryrelock_calls, 0, "Number of tryrelock calls");
 
 static int pmap_tryrelock_restart;
@@ -451,7 +451,7 @@ pa_tryrelock(pmap_t pmap, vm_paddr_t pa,
 	vm_paddr_t lockpa;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	atomic_add_int((volatile int *)&pmap_tryrelock_calls, 1);
+	atomic_add_long((volatile long *)&pmap_tryrelock_calls, 1);
 	lockpa = *locked;
 	*locked = pa;
 	if (lockpa) {