---

yaml --- r: 86335 b: refs/heads/master c: a7ef94e h: refs/heads/master i: 86333: 38837b1 86331: 3b4f54b 86327: acdf6eb 86319: c3039fb 86303: 8aece4d 86271: 5f505c2 v: v3
git-mirror · Feb 26, 2008 · 0008f7d · 0008f7d
1 parent ef0bb08
commit 0008f7d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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 */