From owner-freebsd-current  Mon Dec 25 07:02:28 1995
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id HAA18745
          for current-outgoing; Mon, 25 Dec 1995 07:02:28 -0800 (PST)
Received: from news.st.rim.or.jp (news.st.rim.or.jp [202.255.181.3])
          by freefall.freebsd.org (8.7.3/8.7.3) with ESMTP id HAA18736
          Mon, 25 Dec 1995 07:01:56 -0800 (PST)
Received: (from uucp@localhost) by news.st.rim.or.jp (8.7.1/3.3W-rim1.0) with UUCP id AAA19105; Tue, 26 Dec 1995 00:01:50 +0900 (JST)
Received: (from sa2c@localhost) by us.and.or.jp (8.7.3/3.4W) id AAA00306; Tue, 26 Dec 1995 00:01:11 +0900 (JST)
Date: Tue, 26 Dec 1995 00:01:11 +0900 (JST)
From: NIIMI Satoshi <sa2c@and.or.jp>
Message-Id: <199512251501.AAA00306@us.and.or.jp>
To: current@freebsd.org, davidg@freebsd.org
Subject: wrong cpu identification on -current
Sender: owner-current@freebsd.org
Precedence: bulk

-current kernel identifies my 486 to be 686.  The wrong code is in
$Id: locore.s,v 1.57 1995/12/24 08:10:39 davidg Exp $.

fix is here

--- locore.s.orig	Mon Dec 25 23:49:32 1995
+++ locore.s	Mon Dec 25 23:51:27 1995
@@ -366,7 +366,7 @@
 	andw	$0x08d5,%cx
 	cmpw	%ax,%cx
 
-	jnz	2f			# if flags changed, Intel chip
+	jnz	3f			# if flags changed, Intel chip
 
 	movl	$CPU_486DLC,_cpu-KERNBASE # set CPU value for Cyrix
 	movl	$0x69727943,_cpu_vendor-KERNBASE	# store vendor string
@@ -428,7 +428,7 @@
 	movl	%eax,%cr0
 	invd
 #endif /* CYRIX_CACHE_WORKS */
-	jmp	2f
+	jmp	3f
 
 1:	/* Use the `cpuid' instruction. */
 	xorl	%eax,%eax


Thanx,
Satoshi

--
NIIMI Satoshi