From 34fe89473fd1f33b2b7fad6f13e976a8bf5ccd4a Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 22 Jan 2009 17:06:33 +0000
Subject: [PATCH] Replace couple of strcmp(cpu_vendor, "foo") with
 cpu_vendor_id for i386 and hide i386-specific code under #ifdef.

---
 sys/compat/linprocfs/linprocfs.c | 12 +++++++++---
 sys/i386/cpufreq/smist.c         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index fc2eacb6025..bf2b10c26da 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -276,11 +276,17 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
 
 	sbuf_cat(sb, "flags\t\t:");
 
-	if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) {
-		flags[16] = "fcmov";
-	} else if (!strcmp(cpu_vendor, "CyrixInstead")) {
+#ifdef __i386__
+	switch (cpu_vendor_id) {
+	case CPU_VENDOR_AMD:
+		if (class < 6)
+			flags[16] = "fcmov";
+		break;
+	case CPU_VENDOR_CYRIX:
 		flags[24] = "cxmmx";
+		break;
 	}
+#endif
 
 	for (i = 0; i < 32; i++)
 		if (cpu_feature & (1 << i))
diff --git a/sys/i386/cpufreq/smist.c b/sys/i386/cpufreq/smist.c
index a267226779e..d01140c202b 100644
--- a/sys/i386/cpufreq/smist.c
+++ b/sys/i386/cpufreq/smist.c
@@ -285,7 +285,7 @@ smist_identify(driver_t *driver, device_t parent)
 		return;
 
 	/* Check for a supported processor */
-	if (strcmp(cpu_vendor, "GenuineIntel") != 0)
+	if (cpu_vendor_id != CPU_VENDOR_INTEL)
 		return;
 	switch (cpu_id & 0xff0) {
 	case 0x680:	/* Pentium III [coppermine] */