From owner-svn-src-projects@FreeBSD.ORG Sat Mar 20 05:06:48 2010
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 37464106566B;
Sat, 20 Mar 2010 05:06:48 +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 25B168FC17;
Sat, 20 Mar 2010 05:06:48 +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 o2K56mXt073686;
Sat, 20 Mar 2010 05:06:48 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2K56mLP073684;
Sat, 20 Mar 2010 05:06:48 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201003200506.o2K56mLP073684@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 20 Mar 2010 05:06:48 +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: r205359 - 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 " projects"
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: Sat, 20 Mar 2010 05:06:48 -0000
Author: marcel
Date: Sat Mar 20 05:06:47 2010
New Revision: 205359
URL: http://svn.freebsd.org/changeset/base/205359
Log:
Rather than assume we need to wire the first 256MB, wire the 256MB
that contains the entry point of the kernel.
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 Sat Mar 20 04:40:15 2010 (r205358)
+++ projects/altix/sys/boot/ia64/common/exec.c Sat Mar 20 05:06:47 2010 (r205359)
@@ -117,11 +117,12 @@ elf64_exec(struct preloaded_file *fp)
pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
PTE_PL_KERN | PTE_AR_RWX | PTE_ED;
+ pte |= IA64_RR_MASK(hdr->e_entry) & PTE_PPN_MASK;
- __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7)));
+ __asm __volatile("mov cr.ifa=%0" :: "r"(hdr->e_entry));
__asm __volatile("mov cr.itir=%0" :: "r"(28 << 2));
- __asm __volatile("ptr.i %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
- __asm __volatile("ptr.d %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+ __asm __volatile("ptr.i %0,%1" :: "r"(hdr->e_entry), "r"(28<<2));
+ __asm __volatile("ptr.d %0,%1" :: "r"(hdr->e_entry), "r"(28<<2));
__asm __volatile("srlz.i;;");
__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(pte));
__asm __volatile("srlz.i;;");