--- Net2/arch/i386/include/cpu.h	2018/04/24 18:04:01	1.1.1.1
+++ Net2/arch/i386/include/cpu.h	2018/04/24 18:20:48	1.1.1.2
@@ -33,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cpu.h	5.4 (Berkeley) 5/9/91
+ *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
+ *	cpu.h,v 1.9 1993/06/16 22:28:12 jtc Exp
  */
 
 /*
@@ -46,7 +47,7 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#undef	COPY_SIGCODE		/* don't copy sigcode above user stack in exec */
+#define	COPY_SIGCODE		/* copy sigcode above user stack in exec */
 
 /*
  * function vs. inline configuration;
@@ -54,9 +55,9 @@
  * rather than inline or machine-dependent implementations
  */
 #define	NEED_MINMAX		/* need {,i,l,ul}{min,max} functions */
-#define	NEED_FFS		/* need ffs function */
+#undef	NEED_FFS		/* need ffs function */
 #define	NEED_BCMP		/* need bcmp function */
-#define	NEED_STRLEN		/* need strlen function */
+#undef	NEED_STRLEN		/* need strlen function */
 
 #define	cpu_exec(p)	/* nothing */
 
@@ -98,11 +99,17 @@ int	astpending;		/* need to trap before
 int	want_resched;		/* resched() was called */
 
 /*
- * Kinds of processor
+ * pull in #defines for kinds of processors
  */
+#include "machine/cputypes.h"
 
-#define	CPU_386SX	0
-#define	CPU_386		1
-#define	CPU_486SX	2
-#define	CPU_486		3
-#define	CPU_586		4
+struct cpu_nameclass {
+	char *cpu_name;
+	int  cpu_class;
+};
+
+#ifdef KERNEL
+extern int cpu;
+extern int cpu_class;
+extern struct cpu_nameclass i386_cpus[];
+#endif