diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-25 18:49:35 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-25 18:49:35 +0000 |
| commit | 8508265d49c9b3049cc792bb78efdacf0125b3a3 (patch) | |
| tree | 940e7d4385ac0a7a96f4d5fc236554886d2a7b47 | |
| parent | feac95ce2bdecafb062faf1874e882ef1962569d (diff) | |
constify cpuid tables
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index eac14da82f3..f2beaff611e 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.145 2001/01/25 05:15:24 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.146 2001/01/25 18:49:33 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -686,7 +686,7 @@ extern char version[]; * Note: these are just the ones that may not have a cpuid instruction. * We deal with the rest in a different way. */ -struct cpu_nocpuid_nameclass i386_nocpuid_cpus[] = { +const struct cpu_nocpuid_nameclass i386_nocpuid_cpus[] = { { CPUVENDOR_INTEL, "Intel", "386SX", CPUCLASS_386, NULL}, /* CPU_386SX */ { CPUVENDOR_INTEL, "Intel", "386DX", CPUCLASS_386, @@ -717,7 +717,7 @@ const char *modifiers[] = { "" }; -struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { +const struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { { "GenuineIntel", CPUVENDOR_INTEL, @@ -990,7 +990,7 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { } }; -struct cpu_cpuid_feature i386_cpuid_features[] = { +const struct cpu_cpuid_feature i386_cpuid_features[] = { { CPUID_FPU, "FPU" }, { CPUID_VME, "V86" }, { CPUID_DE, "DE" }, @@ -1176,7 +1176,7 @@ identifycpu() const char *cpu_device = "cpu0"; int class = CPUCLASS_386, vendor, i, max; int family, model, step, modif, cachesize; - struct cpu_cpuid_nameclass *cpup = NULL; + const struct cpu_cpuid_nameclass *cpup = NULL; void (*cpu_setup) __P((const char *, int, int)); if (cpuid_level == -1) { diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 396b54d193a..1a50e9cb4c5 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.32 2001/01/05 04:27:24 marc Exp $ */ +/* $OpenBSD: cpu.h,v 1.33 2001/01/25 18:49:34 mickey Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -161,8 +161,8 @@ extern int cpu_feature; extern int cpu_apmwarn; extern int cpu_apmhalt; extern int cpuid_level; -extern struct cpu_nocpuid_nameclass i386_nocpuid_cpus[]; -extern struct cpu_cpuid_nameclass i386_cpuid_cpus[]; +extern const struct cpu_nocpuid_nameclass i386_nocpuid_cpus[]; +extern const struct cpu_cpuid_nameclass i386_cpuid_cpus[]; #if defined(I586_CPU) || defined(I686_CPU) extern int pentium_mhz; |