svn commit: r205359 - projects/altix/sys/boot/ia64/common

[Marcel Moolenaar]

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;;");