From 2ffa4044e9ca747e8df6a997959e09117c3443b5 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 16 Mar 2011 16:09:08 +0000
Subject: [PATCH] Rework r219679.  Always check CPU class at run-time to make
 it predictable. Unfortunately, it pulls in <machine/cputypes.h> but it is
 small enough and namespace pollution is minimal, I hope.

Pointed out by:	bde
Pointy hat:	jkim
---
 sys/i386/include/cpu.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 42424c899f9..d1d796b06b1 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -39,6 +39,7 @@
 /*
  * Definitions unique to i386 cpu support.
  */
+#include <machine/cputypes.h>
 #include <machine/psl.h>
 #include <machine/frame.h>
 #include <machine/segments.h>
@@ -69,14 +70,13 @@ void	swi_vm(void *);
 static __inline uint64_t
 get_cyclecount(void)
 {
-#if defined(I486_CPU) || defined(KLD_MODULE)
 	struct bintime bt;
 
-	binuptime(&bt);
-	return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
-#else
+	if (cpu_class == CPUCLASS_486) {
+		binuptime(&bt);
+		return ((uint64_t)bt.sec << 56 | bt.frac >> 8);
+	}
 	return (rdtsc());
-#endif
 }
 
 #endif