quite a bit of simplification by removing cpu classes.

also assume that 386 cpus are really unknown, and promote them to 486
instead of panic.

2 files changed, 3 insertions, 24 deletions

diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 22cf9b9c1e4..95e0e8efeef 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.98 2007/11/16 16:16:06 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.99 2007/11/28 17:05:09 tedu Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -263,12 +263,10 @@ struct timeval;
 #define	DELAY(x)		(*delay_func)(x)
 #define delay(x)		(*delay_func)(x)
 
-#if defined(I586_CPU) || defined(I686_CPU)
 /*
  * High resolution clock support (Pentium only)
  */
 void	calibrate_cyclecounter(void);
-#endif
 
 /*
  * pull in #defines for kinds of processors
@@ -326,9 +324,7 @@ extern void (*cpu_idle_leave_fcn)(void);
 /* apm.c */
 extern int cpu_apmwarn;
 
-#if defined(I586_CPU) || defined(I686_CPU)
 extern int cpuspeed;
-#endif
 
 #if !defined(SMALL_KERNEL)
 #define BUS66  6667
@@ -341,11 +337,9 @@ extern int cpuspeed;
 extern int bus_clock;
 #endif
 
-#ifdef I586_CPU
 /* F00F bug fix stuff for pentium cpu */
 extern int cpu_f00f_bug;
 void fix_f00f(void);
-#endif
 
 /* dkcsum.c */
 void	dkcsumattach(void);
@@ -383,30 +377,19 @@ void	i8254_inittimecounter(void);
 void	i8254_inittimecounter_simple(void);
 
 
+#if !defined(SMALL_KERNEL)
 /* est.c */
-#if !defined(SMALL_KERNEL) && defined(I686_CPU)
 void	est_init(const char *, int);
 void	est_setperf(int);
-#endif
-
 /* longrun.c */
-#if !defined(SMALL_KERNEL) && defined(I586_CPU)
 void	longrun_init(void);
 void	longrun_setperf(int);
-#endif
-
 /* p4tcc.c */
-#if !defined(SMALL_KERNEL) && defined(I686_CPU)
 void	p4tcc_init(int, int);
 void	p4tcc_setperf(int);
-#endif
-
-#if !defined(SMALL_KERNEL) && defined(I586_CPU)
 /* powernow.c */
 void	k6_powernow_init(void);
 void	k6_powernow_setperf(int);
-#endif
-#if !defined(SMALL_KERNEL) && defined(I686_CPU)
 /* powernow-k7.c */
 void	k7_powernow_init(void);
 void	k7_powernow_setperf(int);
diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h
index 0a4134b9462..7813ce64ad6 100644
--- a/sys/arch/i386/include/cpufunc.h
+++ b/sys/arch/i386/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.13 2007/02/17 17:38:37 tom Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.14 2007/11/28 17:05:09 tedu Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $	*/
 
 /*
@@ -172,13 +172,11 @@ tlbflushg(void)
 	 * pre-P6-family processors.
 	 */
 
-#if defined(I686_CPU)
 	if (cpu_feature & CPUID_PGE) {
 		u_int cr4 = rcr4();
 		lcr4(cr4 & ~CR4_PGE);
 		lcr4(cr4);
 	} else
-#endif
 		tlbflush();
 }
 
@@ -271,9 +269,7 @@ breakpoint(void)
 	__asm __volatile("int $3");
 }
 
-#ifdef I686_CPU
 void amd64_errata(struct cpu_info *);
-#endif
 
 #endif /* _KERNEL */
 #endif /* !_I386_CPUFUNC_H_ */