PERFORCE change 42597 for review

[Peter Wemm]

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

Change 42597 by peter at peter_overcee on 2003/11/16 16:12:44

	cosmetic diff reduction

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#38 edit
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#26 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#38 (text+ko) ====

@@ -369,9 +369,10 @@
 	/* Disable local apic just to be sure. */
 	lapic_disable();
 
+	/* signal our startup to the BSP. */
 	mp_naps++;
 
-	/* spin until all the AP's are ready */
+	/* Spin until the BSP releases the AP's. */
 	while (!aps_ready)
 		ia32_pause();
 
@@ -493,8 +494,8 @@
 
 	/* Locate the page tables, they'll be below the trampoline */
 	pt4 = (u_int64_t *)(uintptr_t)(mptramp_pagetables + KERNBASE);
-	pt3 = pt4 + 512;
-	pt2 = pt3 + 512;
+	pt3 = pt4 + (PAGE_SIZE) / sizeof(u_int64_t);
+	pt2 = pt3 + (PAGE_SIZE) / sizeof(u_int64_t);
 
 	/* Create the initial 1GB replicated page tables */
 	for (i = 0; i < 512; i++) {
@@ -503,7 +504,7 @@
 		pt4[i] |= PG_V | PG_RW | PG_U;
 
 		/* Each slot of the level 3 pages points to the same level 2 page */
-		pt3[i] = (u_int64_t)(uintptr_t)(mptramp_pagetables + 2 * PAGE_SIZE);
+		pt3[i] = (u_int64_t)(uintptr_t)(mptramp_pagetables + (2 * PAGE_SIZE));
 		pt3[i] |= PG_V | PG_RW | PG_U;
 
 		/* The level 2 page slots are mapped with 2MB pages for 1GB. */

==== //depot/projects/hammer/sys/amd64/isa/atpic.c#26 (text+ko) ====

@@ -72,7 +72,6 @@
 #define	SLAVE_MODE	ICW4_8086
 #endif
 
-
 static void	atpic_init(void *dummy);
 
 unsigned int imen;	/* XXX */