From c5d2c5dcd0b1f0b4554cb9f085df35d2172fabb3 Mon Sep 17 00:00:00 2001
From: takada <takada@mbf.nifty.com>
Date: Tue, 13 Feb 2007 13:26:24 +0100
Subject: [PATCH] --- yaml --- r: 48462 b: refs/heads/master c:
 2632f01a66d75f4ad59653a7efa506c6ea6845d0 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/i386/kernel/cpu/cyrix.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a03cbf44b5c0..12e4813a2769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3101673b659b916c965271c7f7c9b99cb353c01c
+refs/heads/master: 2632f01a66d75f4ad59653a7efa506c6ea6845d0
diff --git a/trunk/arch/i386/kernel/cpu/cyrix.c b/trunk/arch/i386/kernel/cpu/cyrix.c
index c0c3b59de32c..69b263f5632a 100644
--- a/trunk/arch/i386/kernel/cpu/cyrix.c
+++ b/trunk/arch/i386/kernel/cpu/cyrix.c
@@ -285,10 +285,15 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
 		/* GXm supports extended cpuid levels 'ala' AMD */
 		if (c->cpuid_level == 2) {
 			/* Enable cxMMX extensions (GX1 Datasheet 54) */
-			setCx86(CX86_CCR7, getCx86(CX86_CCR7)|1);
+			setCx86(CX86_CCR7, getCx86(CX86_CCR7) | 1);
 			
-			/* GXlv/GXm/GX1 */
-			if((dir1 >= 0x50 && dir1 <= 0x54) || dir1 >= 0x63)
+			/*
+			 * GXm : 0x30 ... 0x5f GXm  datasheet 51
+			 * GXlv: 0x6x          GXlv datasheet 54
+			 *  ?  : 0x7x
+			 * GX1 : 0x8x          GX1  datasheet 56
+			 */
+			if((0x30 <= dir1 && dir1 <= 0x6f) || (0x80 <=dir1 && dir1 <= 0x8f))
 				geode_configure();
 			get_model_name(c);  /* get CPU marketing name */
 			return;