From owner-p4-projects@FreeBSD.ORG  Sun Nov 28 05:38:07 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8B3D016A525; Sun, 28 Nov 2004 05:38:07 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 437A516A51E
	for <perforce@freebsd.org>; Sun, 28 Nov 2004 05:38:07 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD30D43D54
	for <perforce@freebsd.org>; Sun, 28 Nov 2004 05:38:06 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS5c638081479
	for <perforce@freebsd.org>; Sun, 28 Nov 2004 05:38:06 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS5c6uJ081476
	for perforce@freebsd.org; Sun, 28 Nov 2004 05:38:06 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 28 Nov 2004 05:38:06 GMT
Message-Id: <200411280538.iAS5c6uJ081476@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 65969 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Nov 2004 05:38:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=65969

Change 65969 by marcel@marcel_nfs on 2004/11/28 05:37:23

	Initialize pgtbl to NULL and set it to the physical address
	only when we do have a kernel that's not direct mapped.
	This allows us to determine whether we loaded an old or a
	new kernel.

Affected files ...

.. //depot/projects/ia64/sys/boot/ia64/ski/copy.c#3 edit

Differences ...

==== //depot/projects/ia64/sys/boot/ia64/ski/copy.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 #define	PHYS_START	(4L*1024*1024*1024)
 #define	PHYS_SIZE	(64L*1024*1024 - 4L*1024)
 
-uint64_t *pgtbl = (uint64_t *)(PHYS_START + PHYS_SIZE);
+uint64_t *pgtbl = NULL;
 
 static void *
 va2pa(uint64_t va)
@@ -45,6 +45,8 @@
 	if (va > IA64_RR_BASE(7))
 		return ((void *)IA64_RR_MASK(va));
 
+	pgtbl = (uint64_t *)(PHYS_START + PHYS_SIZE);
+
 	if (va < IA64_KERNELBASE) {
 		printf("\n%s: %lx: invalid loader virtual address\n",
 		    __func__, va);