From 6fcdaa438727f2c6e4445216b8fe516197bd7535 Mon Sep 17 00:00:00 2001
From: Zhang Xianyi <xianyi@iscas.ac.cn>
Date: Thu, 5 Jul 2012 13:41:03 +0800
Subject: [PATCH] Detect Sandy Bridge 22nm desktop/mobile CPU.

---
 cpuid_x86.c | 54 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/cpuid_x86.c b/cpuid_x86.c
index ea1162e8f..b304cdade 100644
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -975,27 +975,33 @@ int get_cpuname(void){
 	  return CPUTYPE_DUNNINGTON;
 	}
 	break;
-	  case  2:
-		  switch (model) {
-		  case 5:
-			  //Intel Core (Clarkdale) / Core (Arrandale) 
-			  // Pentium (Clarkdale) / Pentium Mobile (Arrandale) 
-			  // Xeon (Clarkdale), 32nm
-			  return CPUTYPE_NEHALEM;
-		  case 10:
-                          //Intel Core i5-2000 /i7-2000 (Sandy Bridge)
-                          return CPUTYPE_SANDYBRIDGE;
-		  case 12:
-			  //Xeon Processor 5600 (Westmere-EP)
-			  return CPUTYPE_NEHALEM;
-		  case 13:
-                          //Intel Core i7-3000 / Xeon E5 (Sandy Bridge)
-                          return CPUTYPE_SANDYBRIDGE;
-		  case 15:
-			  //Xeon Processor E7 (Westmere-EX)
-			  return CPUTYPE_NEHALEM;
-		  }
-		  break;
+      case  2:
+	switch (model) {
+	case 5:
+	  //Intel Core (Clarkdale) / Core (Arrandale) 
+	  // Pentium (Clarkdale) / Pentium Mobile (Arrandale) 
+	  // Xeon (Clarkdale), 32nm
+	  return CPUTYPE_NEHALEM;
+	case 10:
+	  //Intel Core i5-2000 /i7-2000 (Sandy Bridge)
+	  return CPUTYPE_SANDYBRIDGE;
+	case 12:
+	  //Xeon Processor 5600 (Westmere-EP)
+	  return CPUTYPE_NEHALEM;
+	case 13:
+	  //Intel Core i7-3000 / Xeon E5 (Sandy Bridge)
+	  return CPUTYPE_SANDYBRIDGE;
+	case 15:
+	  //Xeon Processor E7 (Westmere-EX)
+	  return CPUTYPE_NEHALEM;
+	}
+	break;
+      case 3:
+	switch (model) {
+	case 10:
+	  return CPUTYPE_SANDYBRIDGE;
+	}
+	break;
       }
       break;
     case 0x7:
@@ -1349,6 +1355,12 @@ int get_coretype(void){
 	  return CORE_NEHALEM;
 	}
 	break;
+      case 3:
+	switch (model) {
+	case 10:
+	  return CORE_SANDYBRIDGE;
+	}
+	break;
       }
       break;