From 70b4b1a7b6cb0718b423eb9488eb310fe2988f45 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Thu, 4 Sep 2008 20:09:11 -0700
Subject: [PATCH] --- yaml --- r: 112823 b: refs/heads/master c:
 56f0d033be2ebb983993e5d7f24ae232c9a1e7f9 h: refs/heads/master i:   112821:
 a703a764e19d46e0e159417c6145b4b5663e7eb3   112819:
 97b748434c2514c574ab859a4d858cbcca83ee8e   112815:
 cbed35eed02d57ca63f40b9e678798e3b0e545a1 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/x86/kernel/cpu/common_64.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b5ab706ff4ca..f1585548997a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6627d2423067f2c6eedb422a59fba9270a3c5e36
+refs/heads/master: 56f0d033be2ebb983993e5d7f24ae232c9a1e7f9
diff --git a/trunk/arch/x86/kernel/cpu/common_64.c b/trunk/arch/x86/kernel/cpu/common_64.c
index 6475548d64eb..68b06a39dcac 100644
--- a/trunk/arch/x86/kernel/cpu/common_64.c
+++ b/trunk/arch/x86/kernel/cpu/common_64.c
@@ -730,8 +730,20 @@ __setup("noclflush", setup_noclflush);
 
 void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)
 {
+	char *vendor = NULL;
+
+	if (c->x86_vendor < X86_VENDOR_NUM)
+		vendor = this_cpu->c_vendor;
+	else if (c->cpuid_level >= 0)
+		vendor = c->x86_vendor_id;
+
+	if (vendor && strncmp(c->x86_model_id, vendor, strlen(vendor)))
+		printk(KERN_CONT "%s ", vendor);
+
 	if (c->x86_model_id[0])
 		printk(KERN_CONT "%s", c->x86_model_id);
+	else
+		printk(KERN_CONT "%d86", c->x86);
 
 	if (c->x86_mask || c->cpuid_level >= 0)
 		printk(KERN_CONT " stepping %02x\n", c->x86_mask);