PERFORCE change 28218 for review

[Peter Wemm]

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

Change 28218 by peter at peter_overcee on 2003/04/05 03:15:15

	temporarily use another symbol for the page table array

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/pmap.h#12 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#24 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#15 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#15 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/pmap.h#12 (text+ko) ====

@@ -153,7 +153,7 @@
 extern pml4_entry_t	PML4[];
 extern pdp_entry_t	PDP[];
 extern pd_entry_t	PTD[];
-extern pd_entry_t	PML4pml4e[];
+extern pd_entry_t	PTDpde[];
 
 extern pml4_entry_t *IdlePML4;	/* physical address of "Idle" state directory */
 extern pdp_entry_t *IdlePDP;	/* physical address of "Idle" state directory */

==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#24 (text+ko) ====


==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#15 (text+ko) ====

@@ -538,7 +538,7 @@
 pmap_is_current(pmap_t pmap)
 {
 	return (pmap == kernel_pmap ||
-	    (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME));
+	    (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME));
 }
 
 /*

==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#15 (text+ko) ====

@@ -272,7 +272,7 @@
 	printf("Keyboard reset did not work, attempting CPU shutdown\n");
 	DELAY(1000000);	/* wait 1 sec for printf to complete */
 	/* force a shutdown by unmapping entire address space ! */
-	bzero((caddr_t)PML4, NBPML4T);
+	bzero((caddr_t)PTD, NBPTD);
 
 	/* "good night, sweet prince .... <THUNK!>" */
 	invltlb();