Use UPAGES when setting up private pages for SMP (which includes idle stack).

12 files changed, 72 insertions, 72 deletions

diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 3568961..81b373a 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.100 1997/10/10 09:44:00 peter Exp $
+ *	$Id: locore.s,v 1.101 1997/11/04 03:19:25 kato Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -97,10 +97,10 @@
 	.set	_SMP_prvpt,_SMP_prvstart + PAGE_SIZE
 	.set	_lapic,_SMP_prvstart + (2 * PAGE_SIZE)
 	.set	_idlestack,_SMP_prvstart + (3 * PAGE_SIZE)
-	.set	_idlestack_top,_SMP_prvstart + (5 * PAGE_SIZE)
-	.set	_prv_CPAGE1,_SMP_prvstart + (5 * PAGE_SIZE)
-	.set	_prv_CPAGE2,_SMP_prvstart + (6 * PAGE_SIZE)
-	.set	_prv_CPAGE3,_SMP_prvstart + (7 * PAGE_SIZE)
+	.set	_idlestack_top,_SMP_prvstart + (( 3 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE1,_SMP_prvstart + ((3 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE2,_SMP_prvstart + ((4 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE3,_SMP_prvstart + ((5 + UPAGES) * PAGE_SIZE)
 	.set	_SMP_ioapic,_SMP_prvstart + (16 * PAGE_SIZE)
 
 	.globl	_cpuid,_curproc,_curpcb,_npxproc,_runtime,_cpu_lockid
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 3568961..81b373a 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.100 1997/10/10 09:44:00 peter Exp $
+ *	$Id: locore.s,v 1.101 1997/11/04 03:19:25 kato Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -97,10 +97,10 @@
 	.set	_SMP_prvpt,_SMP_prvstart + PAGE_SIZE
 	.set	_lapic,_SMP_prvstart + (2 * PAGE_SIZE)
 	.set	_idlestack,_SMP_prvstart + (3 * PAGE_SIZE)
-	.set	_idlestack_top,_SMP_prvstart + (5 * PAGE_SIZE)
-	.set	_prv_CPAGE1,_SMP_prvstart + (5 * PAGE_SIZE)
-	.set	_prv_CPAGE2,_SMP_prvstart + (6 * PAGE_SIZE)
-	.set	_prv_CPAGE3,_SMP_prvstart + (7 * PAGE_SIZE)
+	.set	_idlestack_top,_SMP_prvstart + (( 3 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE1,_SMP_prvstart + ((3 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE2,_SMP_prvstart + ((4 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE3,_SMP_prvstart + ((5 + UPAGES) * PAGE_SIZE)
 	.set	_SMP_ioapic,_SMP_prvstart + (16 * PAGE_SIZE)
 
 	.globl	_cpuid,_curproc,_curpcb,_npxproc,_runtime,_cpu_lockid
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index a31857a..f1e720f 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index a31857a..f1e720f 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index f3ec1fa..126de55 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.170 1997/11/07 08:52:29 phk Exp $
+ *	$Id: pmap.c,v 1.171 1997/11/07 09:20:18 phk Exp $
  */
 
 /*
@@ -438,9 +438,9 @@ pmap_bootstrap(firstaddr, loadaddr)
 	}
 
 	/* BSP does this itself, AP's get it pre-set */
-	prv_CMAP1 = (pt_entry_t *)&SMP_prvpt[5];
-	prv_CMAP2 = (pt_entry_t *)&SMP_prvpt[6];
-	prv_CMAP3 = (pt_entry_t *)&SMP_prvpt[7];
+	prv_CMAP1 = (pt_entry_t *)&SMP_prvpt[3 + UPAGES];
+	prv_CMAP2 = (pt_entry_t *)&SMP_prvpt[4 + UPAGES];
+	prv_CMAP3 = (pt_entry_t *)&SMP_prvpt[5 + UPAGES];
 #endif
 
 	invltlb();
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index a31857a..f1e720f 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 3568961..81b373a 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.100 1997/10/10 09:44:00 peter Exp $
+ *	$Id: locore.s,v 1.101 1997/11/04 03:19:25 kato Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -97,10 +97,10 @@
 	.set	_SMP_prvpt,_SMP_prvstart + PAGE_SIZE
 	.set	_lapic,_SMP_prvstart + (2 * PAGE_SIZE)
 	.set	_idlestack,_SMP_prvstart + (3 * PAGE_SIZE)
-	.set	_idlestack_top,_SMP_prvstart + (5 * PAGE_SIZE)
-	.set	_prv_CPAGE1,_SMP_prvstart + (5 * PAGE_SIZE)
-	.set	_prv_CPAGE2,_SMP_prvstart + (6 * PAGE_SIZE)
-	.set	_prv_CPAGE3,_SMP_prvstart + (7 * PAGE_SIZE)
+	.set	_idlestack_top,_SMP_prvstart + (( 3 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE1,_SMP_prvstart + ((3 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE2,_SMP_prvstart + ((4 + UPAGES) * PAGE_SIZE)
+	.set	_prv_CPAGE3,_SMP_prvstart + ((5 + UPAGES) * PAGE_SIZE)
 	.set	_SMP_ioapic,_SMP_prvstart + (16 * PAGE_SIZE)
 
 	.globl	_cpuid,_curproc,_curpcb,_npxproc,_runtime,_cpu_lockid
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index a31857a..f1e720f 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index a31857a..f1e720f 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index f3ec1fa..126de55 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.170 1997/11/07 08:52:29 phk Exp $
+ *	$Id: pmap.c,v 1.171 1997/11/07 09:20:18 phk Exp $
  */
 
 /*
@@ -438,9 +438,9 @@ pmap_bootstrap(firstaddr, loadaddr)
 	}
 
 	/* BSP does this itself, AP's get it pre-set */
-	prv_CMAP1 = (pt_entry_t *)&SMP_prvpt[5];
-	prv_CMAP2 = (pt_entry_t *)&SMP_prvpt[6];
-	prv_CMAP3 = (pt_entry_t *)&SMP_prvpt[7];
+	prv_CMAP1 = (pt_entry_t *)&SMP_prvpt[3 + UPAGES];
+	prv_CMAP2 = (pt_entry_t *)&SMP_prvpt[4 + UPAGES];
+	prv_CMAP3 = (pt_entry_t *)&SMP_prvpt[5 + UPAGES];
 #endif
 
 	invltlb();
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index a31857a..f1e720f 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index a31857a..f1e720f 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $
+ *	$Id: mp_machdep.c,v 1.59 1997/10/28 15:58:10 bde Exp $
  */
 
 #include "opt_smp.h"
@@ -1607,9 +1607,9 @@ start_all_aps(u_int boot_addr)
 		for (i = 0; i < UPAGES; i++)
 			newpt[i + 3] = (pt_entry_t)(PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack));
 
-		newpt[5] = 0;			/* *prv_CMAP1 */
-		newpt[6] = 0;			/* *prv_CMAP2 */
-		newpt[7] = 0;			/* *prv_CMAP3 */
+		newpt[3 + UPAGES] = 0;		/* *prv_CMAP1 */
+		newpt[4 + UPAGES] = 0;		/* *prv_CMAP2 */
+		newpt[5 + UPAGES] = 0;		/* *prv_CMAP3 */
 
 		/* prime data page for it to use */
 		newpp[0] = x;			/* cpuid */
@@ -1622,9 +1622,9 @@ start_all_aps(u_int boot_addr)
 		newpp[7] = 0;			/* other_cpus */
 		newpp[8] = (int)myPTD;		/* my_idlePTD */
 		newpp[9] = 0;			/* ss_tpr */
-		newpp[10] = (int)&newpt[5];	/* prv_CMAP1 */
-		newpp[11] = (int)&newpt[6];	/* prv_CMAP2 */
-		newpp[12] = (int)&newpt[7];	/* prv_CMAP3 */
+		newpp[10] = (int)&newpt[3 + UPAGES];	/* prv_CMAP1 */
+		newpp[11] = (int)&newpt[4 + UPAGES];	/* prv_CMAP2 */
+		newpp[12] = (int)&newpt[5 + UPAGES];	/* prv_CMAP3 */
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;