From 5772203b17dca9b6c89117e6ff3af7786fec566a Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 15 Aug 2013 21:09:05 +0000
Subject: [PATCH] Simplify check for CMPXCHG8B instruction.  Note CMPXCHG8B
 instruction is always available for Rise mP6 processors although it is not
 set by CPUID.

---
 sys/i386/i386/initcpu.c | 16 ++++++++++++++++
 sys/i386/i386/machdep.c |  3 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index 5f33897360c6..71c57b258168 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -423,6 +423,19 @@ init_6x86(void)
 #endif /* I486_CPU */
 
 #ifdef I586_CPU
+/*
+ * Rise mP6
+ */
+static void
+init_rise(void)
+{
+
+	/*
+	 * The CMPXCHG8B instruction is always available but hidden.
+	 */
+	cpu_feature |= CPUID_CX8;
+}
+
 /*
  * IDT WinChip C6/2/2A/2B/3
  *
@@ -690,6 +703,9 @@ initializecpu(void)
 		case CPU_VENDOR_TRANSMETA:
 			init_transmeta();
 			break;
+		case CPU_VENDOR_RISE:
+			init_rise();
+			break;
 		}
 		break;
 #endif
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index be391b6988ee..f62854bdc668 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1557,8 +1557,7 @@ static void
 cpu_probe_cmpxchg8b(void)
 {
 
-	if ((cpu_feature & CPUID_CX8) != 0 ||
-	    cpu_vendor_id == CPU_VENDOR_RISE) {
+	if ((cpu_feature & CPUID_CX8) != 0) {
 		atomic_load_acq_64 = atomic_load_acq_64_i586;
 		atomic_store_rel_64 = atomic_store_rel_64_i586;
 	}