PERFORCE change 65969 for review

[Marcel Moolenaar]

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

Change 65969 by marcel at 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);