1 files changed, 23 insertions, 0 deletions

diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c
index b8d847b850dc..121aa2176e69 100644
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
@@ -77,6 +77,27 @@ static void __init Intel_errata_workarounds(struct cpuinfo_x86 *c)
 }
 
 
+/*
+ * find out the number of processor cores on the die
+ */
+static int __init num_cpu_cores(struct cpuinfo_x86 *c)
+{
+        unsigned int eax;
+
+        if (c->cpuid_level < 4)
+                return 1;
+
+        __asm__("cpuid"
+                : "=a" (eax)
+                : "0" (4), "c" (0)
+                : "bx", "dx");
+
+        if (eax & 0x1f)
+                return ((eax >> 26) + 1);
+        else
+                return 1;
+}
+
 static void __init init_intel(struct cpuinfo_x86 *c)
 {
         unsigned int l2 = 0;
@@ -139,6 +160,8 @@ static void __init init_intel(struct cpuinfo_x86 *c)
         if ( p )
                 strcpy(c->x86_model_id, p);
         
+        c->x86_num_cores = num_cpu_cores(c);
+
         detect_ht(c);
 
         /* Work around errata */