Index: lib/libc/x86/sys/__vdso_gettc.c
===================================================================
--- lib/libc/x86/sys/__vdso_gettc.c
+++ lib/libc/x86/sys/__vdso_gettc.c
@@ -52,14 +52,56 @@
 #endif
 #include "libc_private.h"
 
+static enum LMB {
+	LMB_UNKNOWN,
+	LMB_NONE,
+	LMB_MFENCE,
+	LMB_LFENCE
+} lfence_works = LMB_UNKNOWN;
+
 static void
-lfence_mb(void)
+cpuidp(u_int leaf, u_int p[4])
+{
+
+	__asm __volatile(
+#if defined(__i386__)
+	    "	pushl	%%ebx\n"
+#endif
+	    "	cpuid\n"
+#if defined(__i386__)
+	    "	movl	%%ebx,%1\n"
+	    "	popl	%%ebx"
+#endif
+	    : "=a" (p[0]),
+#if defined(__i386__)
+	    "=r" (p[1]),
+#elif defined(__amd64__)
+	    "=b" (p[1]),
+#else
+#error "Arch"
+#endif
+	    "=c" (p[2]), "=d" (p[3])
+	    :  "0" (leaf));
+}
+
+static enum LMB
+select_lmb(void)
+{
+	u_int p[4];
+	static const char intel_id[] = "GenuntelineI";
+
+	cpuidp(0, p);
+	return (memcmp(p + 1, intel_id, sizeof(intel_id) - 1) == 0 ?
+	    LMB_LFENCE : LMB_MFENCE);
+}
+
+static void
+rdtsc_mb(void)
 {
 #if defined(__i386__)
-	static int lfence_works = -1;
 	u_int cpuid_supported, p[4];
 
-	if (lfence_works == -1) {
+	if (__predict_false(lfence_works == LMB_UNKNOWN)) {
 		__asm __volatile(
 		    "	pushfl\n"
 		    "	popl	%%eax\n"
@@ -77,24 +119,26 @@
 		    "2:\n"
 		    : "=r" (cpuid_supported) : : "eax", "ecx", "cc");
 		if (cpuid_supported) {
-			__asm __volatile(
-			    "	pushl	%%ebx\n"
-			    "	cpuid\n"
-			    "	movl	%%ebx,%1\n"
-			    "	popl	%%ebx\n"
-			    : "=a" (p[0]), "=r" (p[1]), "=c" (p[2]), "=d" (p[3])
-			    :  "0" (0x1));
-			lfence_works = (p[3] & CPUID_SSE2) != 0;
+			cpuidp(0x1, p);
+			if ((p[3] & CPUID_SSE2) != 0)
+				lfence_works = select_lmb();
 		} else
-			lfence_works = 0;
+			lfence_works = LMB_NONE;
 	}
-	if (lfence_works == 1)
-		lfence();
 #elif defined(__amd64__)
-	lfence();
+	if (__predict_false(lfence_works == LMB_UNKNOWN))
+		lfence_works = select_lmb();
 #else
-#error "arch"
+#error "Arch"
 #endif
+	switch (lfence_works) {
+	case LMB_MFENCE:
+		mfence();
+		break;
+	case LMB_LFENCE:
+		lfence();
+		break;
+	}
 }
 
 static u_int
@@ -102,7 +146,7 @@
 {
 	u_int rv;
 
-	lfence_mb();
+	rdtsc_mb();
 	__asm __volatile("rdtsc; shrd %%cl, %%edx, %0"
 	    : "=a" (rv) : "c" (th->th_x86_shift) : "edx");
 	return (rv);
@@ -112,7 +156,7 @@
 __vdso_rdtsc32(void)
 {
 
-	lfence_mb();
+	rdtsc_mb();
 	return (rdtsc32());
 }
 
@@ -212,7 +256,7 @@
 		scale = tsc_ref->tsc_scale;
 		ofs = tsc_ref->tsc_ofs;
 
-		lfence_mb();
+		rdtsc_mb();
 		tsc = rdtsc();
 
 		/* ret = ((tsc * scale) >> 64) + ofs */