summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormr <mr@FreeBSD.org>2006-08-04 13:49:16 +0000
committermr <mr@FreeBSD.org>2006-08-04 13:49:16 +0000
commit77027a81d429ef70c8b226c4eb5e3067b791fdb4 (patch)
treed045d4297e98b4f7a6dc5466c083458a23a8a0b3
parentbd6ce8ca51b200e0cd17f5ded3486e0136200cb7 (diff)
downloadFreeBSD-src-77027a81d429ef70c8b226c4eb5e3067b791fdb4.zip
FreeBSD-src-77027a81d429ef70c8b226c4eb5e3067b791fdb4.tar.gz
Dont overwrite cpu_model in the case of Via's C3-CPU.
Noticed by: Mike Tancsa MFC after: 2 days
-rw-r--r--sys/i386/i386/identcpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 89125fc..832f8ff 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -586,9 +586,10 @@ printcpuinfo(void)
strcpy(cpu_model, "VIA C3 Nehemiah");
if ((cpu_id & 0xf) < 3)
break;
- /* fall through. */
+ goto via_common;
case 0x6a0:
strcpy(cpu_model, "VIA C7 Esther");
+via_common:
do_cpuid(0xc0000000, regs);
i = regs[0];
if (i >= 0xC0000001) {
OpenPOWER on IntegriCloud