From 0008f7d85dd3a930f9522d9b9d6c964a2ac41f9c Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Thu, 14 Feb 2008 14:51:00 -0800
Subject: [PATCH] --- yaml --- r: 86335 b: refs/heads/master c:
 a7ef94e6889186848573a10c5bdb8271405f44de h: refs/heads/master i:   86333:
 38837b1bf854b21725378fa76597d34f24b2ff62   86331:
 3b4f54b6128d211698fbaf493084e2c6e0abd53f   86327:
 acdf6eb92d3916462fe1f9906c95b79f3c500d36   86319:
 c3039fb20d6e5360271d342d41ce23bb71225cc1   86303:
 8aece4d4514f87b51cb735a1148e024a3a4975fb   86271:
 5f505c2c55174805ce87871d247d1d2743aff538 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/kernel/cpu/transmeta.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c9258d927a73..10cf722732fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b02a7f22f39f02fdf5a1380ff700293639db4490
+refs/heads/master: a7ef94e6889186848573a10c5bdb8271405f44de
diff --git a/trunk/arch/x86/kernel/cpu/transmeta.c b/trunk/arch/x86/kernel/cpu/transmeta.c
index 200fb3f9ebfb..e8b422c1c512 100644
--- a/trunk/arch/x86/kernel/cpu/transmeta.c
+++ b/trunk/arch/x86/kernel/cpu/transmeta.c
@@ -76,13 +76,6 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)
 	/* All Transmeta CPUs have a constant TSC */
 	set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability);
 	
-	/* If we can run i686 user-space code, call us an i686 */
-#define USER686 ((1 << X86_FEATURE_TSC)|\
-		 (1 << X86_FEATURE_CX8)|\
-		 (1 << X86_FEATURE_CMOV))
-        if (c->x86 == 5 && (c->x86_capability[0] & USER686) == USER686)
-		c->x86 = 6;
-
 #ifdef CONFIG_SYSCTL
 	/* randomize_va_space slows us down enormously;
 	   it probably triggers retranslation of x86->native bytecode */