add cpu_ecxfeature to cpu.h, and stop locally externing it and cpu_feature.

ok deraadt@

3 files changed, 4 insertions, 13 deletions

diff --git a/sys/arch/i386/i386/est.c b/sys/arch/i386/i386/est.c
index 43c5639e9c4..aac08c6d8e0 100644
--- a/sys/arch/i386/i386/est.c
+++ b/sys/arch/i386/i386/est.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: est.c,v 1.2 2003/12/19 05:52:27 millert Exp $ */
+/*	$OpenBSD: est.c,v 1.3 2003/12/19 22:42:13 tedu Exp $ */
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
@@ -202,7 +202,6 @@ est_init(const char *cpu_device)
 	u_int64_t msr;
 	char *tag;
 	const struct fqlist *fql;
-	extern int cpu_ecxfeature;
 	extern char cpu_brandstr[];
 
 	if ((cpu_ecxfeature & CPUIDECX_EST) == 0)
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 37e88e4ae66..48a79a4b5a8 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.255 2003/12/19 19:03:34 grange Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.256 2003/12/19 22:42:13 tedu Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -1066,7 +1066,6 @@ winchip_cpu_setup(cpu_device, model, step)
 	int model, step;
 {
 #if defined(I586_CPU)
-	extern int cpu_feature;
 
 	switch (model) {
 	case 4: /* WinChip C6 */
@@ -1468,7 +1467,6 @@ cyrix3_cpu_setup(cpu_device, model, step)
 	int model, step;
 {
 #if defined(I686_CPU)
-	extern int cpu_feature;
 	unsigned int val;
 
 	switch (model) {
@@ -1627,10 +1625,6 @@ intel686_cpu_setup(cpu_device, model, step)
 	const char *cpu_device;
 	int model, step;
 {
-	extern int cpu_feature, cpuid_level;
-#ifndef SMALL_KERNEL
-	extern int cpu_ecxfeature;
-#endif
 	u_quad_t msr119;
 
 	/*
@@ -1771,8 +1765,6 @@ identifycpu()
 	extern char cpu_vendor[];
 	extern char cpu_brandstr[];
 	extern int cpu_id;
-	extern int cpu_feature;
-	extern int cpu_ecxfeature;
 #ifdef CPUDEBUG
 	extern int cpu_cache_eax, cpu_cache_ebx, cpu_cache_ecx, cpu_cache_edx;
 #else
@@ -3082,7 +3074,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 {
 	extern char cpu_vendor[];
 	extern int cpu_id;
-	extern int cpu_feature;
 #if NAPM > 0
 	extern int cpu_apmwarn;
 #endif
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 6bdea1fc2b6..3a6fbcb88ee 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.52 2003/12/18 23:46:19 tedu Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.53 2003/12/19 22:42:13 tedu Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -143,6 +143,7 @@ struct cpu_cpuid_feature {
 extern int cpu;
 extern int cpu_class;
 extern int cpu_feature;
+extern int cpu_ecxfeature;
 extern int cpu_apmwarn;
 extern int cpu_apmhalt;
 extern int cpuid_level;