From owner-svn-src-projects@FreeBSD.ORG  Mon Mar 14 05:13:52 2011
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 7934C1065679;
	Mon, 14 Mar 2011 05:13:52 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6799E8FC0C;
	Mon, 14 Mar 2011 05:13:52 +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 p2E5Dqjl077885;
	Mon, 14 Mar 2011 05:13:52 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2E5Dq3Q077883;
	Mon, 14 Mar 2011 05:13:52 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201103140513.p2E5Dq3Q077883@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 14 Mar 2011 05:13:52 +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: r219629 - projects/altix/sys/boot/ia64/common
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: Mon, 14 Mar 2011 05:13:52 -0000

Author: marcel
Date: Mon Mar 14 05:13:52 2011
New Revision: 219629
URL: http://svn.freebsd.org/changeset/base/219629

Log:
  Change the sz argumnt to mmu_wire() from u_int to vm_size_t. It's a
  size in bytes...

Modified:
  projects/altix/sys/boot/ia64/common/exec.c

Modified: projects/altix/sys/boot/ia64/common/exec.c
==============================================================================
--- projects/altix/sys/boot/ia64/common/exec.c	Mon Mar 14 02:32:10 2011	(r219628)
+++ projects/altix/sys/boot/ia64/common/exec.c	Mon Mar 14 05:13:52 2011	(r219629)
@@ -85,7 +85,7 @@ enter_kernel(uint64_t start, struct boot
 }
 
 static void
-mmu_wire(vm_offset_t va, vm_paddr_t pa, u_int sz, u_int acc)
+mmu_wire(vm_offset_t va, vm_paddr_t pa, vm_size_t sz, u_int acc)
 {
 	static u_int iidx = 0, didx = 0;
 	pt_entry_t pte;
@@ -113,6 +113,7 @@ mmu_wire(vm_offset_t va, vm_paddr_t pa, 
 	__asm __volatile("mov cr.ifa=%0" :: "r"(va));
 	__asm __volatile("mov cr.itir=%0" :: "r"(shft << 2));
 	__asm __volatile("srlz.d;;");
+
 	__asm __volatile("ptr.d %0,%1" :: "r"(va), "r"(shft << 2));
 	__asm __volatile("srlz.d;;");
 	__asm __volatile("itr.d dtr[%0]=%1" :: "r"(didx), "r"(pte));
@@ -148,7 +149,7 @@ mmu_setup_legacy(uint64_t entry)
 static void
 mmu_setup_paged(vm_offset_t pbvm_top)
 {
-	u_int sz;
+	vm_size_t sz;
 
 	ia64_set_rr(IA64_RR_BASE(IA64_PBVM_RR),
 	    (IA64_PBVM_RR << 8) | (IA64_PBVM_PAGE_SHIFT << 2));