5081104 NCPU has been outgrown on x86

3 files changed, 37 insertions, 19 deletions

diff --git a/usr/src/uts/i86pc/ml/genassym.c b/usr/src/uts/i86pc/ml/genassym.c
index 6ecdf199b1..a346a8f59b 100644
--- a/usr/src/uts/i86pc/ml/genassym.c
+++ b/usr/src/uts/i86pc/ml/genassym.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -166,7 +165,6 @@ main(int argc, char *argv[])
 	printf("#define\tMMU_STD_PAGESHIFT 0x%x\n", (uint_t)MMU_STD_PAGESHIFT);
 	printf("#define\tMMU_STD_PAGEMASK 0x%x\n", (uint_t)MMU_STD_PAGEMASK);
 	printf("#define\tMMU_L2_MASK 0x%x\n", (uint_t)(NPTEPERPT - 1));
-	printf("#define\tMMU_PAGEOFFSET 0x%x\n", (uint_t)(MMU_PAGESIZE - 1));
 	printf("#define\tNPTESHIFT 0x%x\n", (uint_t)NPTESHIFT);
 	printf("#define\tFOURMB_PAGEOFFSET 0x%x\n", (uint_t)FOURMB_PAGEOFFSET);
 	printf("#define\tFOURMB_PAGESIZE 0x%x\n", (uint_t)FOURMB_PAGESIZE);
@@ -176,8 +174,6 @@ main(int argc, char *argv[])
 
 	printf("#define\tTRAPTR_NENT 0x%x\n", TRAPTR_NENT);
 
-	printf("#define\tNCPU 0x%x\n", NCPU);
-
 	printf("#define\tCPU_DTRACE_NOFAULT 0x%x\n", CPU_DTRACE_NOFAULT);
 	printf("#define\tCPU_DTRACE_BADADDR 0x%x\n", CPU_DTRACE_BADADDR);
 	printf("#define\tCPU_DTRACE_ILLOP 0x%x\n", CPU_DTRACE_ILLOP);
diff --git a/usr/src/uts/i86pc/ml/locore.s b/usr/src/uts/i86pc/ml/locore.s
index b6ed089f9b..bc88297503 100644
--- a/usr/src/uts/i86pc/ml/locore.s
+++ b/usr/src/uts/i86pc/ml/locore.s
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -40,6 +39,7 @@
 #include <sys/psw.h>
 #include <sys/reboot.h>
 #include <sys/x86_archext.h>
+#include <sys/machparam.h>
 
 #if defined(__lint)
 
@@ -140,18 +140,43 @@
 	.NWORD	trap_tr0 + TRAP_TSIZE	/* limit */
 	.NWORD	0			/* pad */
 
-#if NCPU != 21
-#error "NCPU != 21, Expand padding for trap_trace_ctl"
+	/*
+	 * Enough padding for 31 more CPUs (no .skip on x86 -- grrrr).
+	 */
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
+#if defined(__amd64)
+
+#if NCPU != 64
+#error	"NCPU != 64, Expand padding for trap_trace_ctl"
 #endif
 
 	/*
-	 * Enough padding for 20 CPUs (no .skip on x86 -- grrrr).
+	 * Enough padding for 32 more CPUs (no .skip on x86 -- grrrr).
 	 */
 	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	.NWORD	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
+#else	/* __amd64 */
+
+#if NCPU != 32
+#error "NCPU != 32, Expand padding for trap_trace_ctl"
+#endif
+
+#endif	/* __amd64 */
 
 	/*
 	 * CPU 0's preallocated TRAPTRACE buffer.
diff --git a/usr/src/uts/i86pc/ml/offsets.in b/usr/src/uts/i86pc/ml/offsets.in
index 13ec19da05..d3a221d0c8 100644
--- a/usr/src/uts/i86pc/ml/offsets.in
+++ b/usr/src/uts/i86pc/ml/offsets.in
@@ -5,9 +5,8 @@
 \ CDDL HEADER START
 \
 \ The contents of this file are subject to the terms of the
-\ Common Development and Distribution License, Version 1.0 only
-\ (the "License").  You may not use this file except in compliance
-\ with the License.
+\ Common Development and Distribution License (the "License").
+\ You may not use this file except in compliance with the License.
 \
 \ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 \ or http://www.opensolaris.org/os/licensing.
@@ -291,8 +290,6 @@ cpu_tables
 	ct_stack
 	ct_gdt
 
-\#define	DEFAULTSTKSZ	_CONST(CT_GDT - CT_STACK)
-
 ddi_acc_impl
 	ahi_acc_attr	ACC_ATTR
 	ahi_get8	ACC_GETB