From 9248fc7bc05ac63a19e7e1bf4f44f296fd96b0b5 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Thu, 3 Jun 2004 20:18:15 +0000 Subject: MFi386: move cpu_nameclass struct next to its only consumer --- sys/amd64/amd64/identcpu.c | 5 ++++- sys/amd64/include/cputypes.h | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 04990529b2bb4..ae0d8beaa7975 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -90,7 +90,10 @@ SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, static char cpu_brand[48]; -static struct cpu_nameclass amd64_cpus[] = { +static struct { + char *cpu_name; + int cpu_class; +} amd64_cpus[] = { { "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h index 2048458bfa3ca..f06aa7145b1d4 100644 --- a/sys/amd64/include/cputypes.h +++ b/sys/amd64/include/cputypes.h @@ -44,11 +44,6 @@ #define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ #ifndef LOCORE -struct cpu_nameclass { - char *cpu_name; - int cpu_class; -}; - extern int cpu; extern int cpu_class; #endif -- cgit v1.3