diff options
| author | Dimitry Andric <dim@cvs.openbsd.org> | 2006-11-29 20:03:21 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@cvs.openbsd.org> | 2006-11-29 20:03:21 +0000 |
| commit | be1eefc2baf28ab9484ecd9842c6cf7dbd312624 (patch) | |
| tree | 2e134ae31b3566589c51477924476aa22212a4f1 /sys/arch/i386/include/cpu.h | |
| parent | 3a311ba77e608a63dedd111b3163d6955ecdc9ca (diff) | |
Remove all the extern cpu_{id,model,whatever} declarations from most
stuff in arch/i386/i386. This should prevent more screwups like the
one I did before in ichpcib.c...
ok dlg@ kettenis@
Diffstat (limited to 'sys/arch/i386/include/cpu.h')
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index e1954531041..a437cd29c6b 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.82 2006/11/29 12:26:13 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.83 2006/11/29 20:03:20 dim Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -288,16 +288,27 @@ struct cpu_cpuid_feature { }; #ifdef _KERNEL +/* locore.s */ extern int cpu; -extern int cpu_class; +extern int cpu_id; +extern char cpu_vendor[]; /* note: NOT nul-terminated */ +extern char cpu_brandstr[]; +extern int cpuid_level; extern int cpu_miscinfo; extern int cpu_feature; extern int cpu_ecxfeature; -extern int cpu_apmwarn; +extern int cpu_cache_eax; +extern int cpu_cache_ebx; +extern int cpu_cache_ecx; +extern int cpu_cache_edx; +/* machdep.c */ extern int cpu_apmhalt; -extern int cpuid_level; +extern int cpu_class; +extern char cpu_model[]; extern const struct cpu_nocpuid_nameclass i386_nocpuid_cpus[]; extern const struct cpu_cpuid_nameclass i386_cpuid_cpus[]; +/* apm.c */ +extern int cpu_apmwarn; #if defined(I586_CPU) || defined(I686_CPU) extern int pentium_mhz; |