From owner-svn-src-projects@FreeBSD.ORG  Tue Mar 15 06:04:13 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 8A3A4106564A;
	Tue, 15 Mar 2011 06:04:13 +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 78B2C8FC08;
	Tue, 15 Mar 2011 06:04:13 +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 p2F64DhI023236;
	Tue, 15 Mar 2011 06:04:13 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2F64DNV023234;
	Tue, 15 Mar 2011 06:04:13 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201103150604.p2F64DNV023234@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 15 Mar 2011 06:04:13 +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: r219657 - 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: Tue, 15 Mar 2011 06:04:13 -0000

Author: marcel
Date: Tue Mar 15 06:04:13 2011
New Revision: 219657
URL: http://svn.freebsd.org/changeset/base/219657

Log:
  Round the size, not the top address. This makes the code less
  sensitive to compiler bugs (32-bit truncation).

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	Tue Mar 15 01:06:27 2011	(r219656)
+++ projects/altix/sys/boot/ia64/common/exec.c	Tue Mar 15 06:04:13 2011	(r219657)
@@ -160,8 +160,8 @@ mmu_setup_paged(vm_offset_t pbvm_top)
 	    PTE_AR_RW);
 
 	/* Wire as much of the PBVM we can. This must be a power of 2. */
-	pbvm_top = (pbvm_top + IA64_PBVM_PAGE_MASK) & ~IA64_PBVM_PAGE_MASK;
 	sz = pbvm_top - IA64_PBVM_BASE;
+	sz = (sz + IA64_PBVM_PAGE_MASK) & ~IA64_PBVM_PAGE_MASK;
 	while (sz & (sz - 1))
 		sz -= IA64_PBVM_PAGE_SIZE;
 	mmu_wire(IA64_PBVM_BASE, ia64_pgtbl[0], sz, PTE_AR_RWX);