aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-19 21:41:16 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:21:21 -0400
commitbd32a8cfa8f172bd943655a3663d8005e5c1d83c (patch)
treef2d35722bed978828114ea53ccb13a2f0e0b805f /arch/x86/kernel/cpu
parent606ee44dbb72fd48beb47f171d7b9cecf6ade6dd (diff)
x86: cpu don't print duplicated vendor string
Some CPUs have vendor string in the middle of model_id instead of beginning Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index fb789dd9e691..088fbdb6734e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -797,7 +797,7 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)
797 else if (c->cpuid_level >= 0) 797 else if (c->cpuid_level >= 0)
798 vendor = c->x86_vendor_id; 798 vendor = c->x86_vendor_id;
799 799
800 if (vendor && strncmp(c->x86_model_id, vendor, strlen(vendor))) 800 if (vendor && !strstr(c->x86_model_id, vendor))
801 printk(KERN_CONT "%s ", vendor); 801 printk(KERN_CONT "%s ", vendor);
802 802
803 if (c->x86_model_id[0]) 803 if (c->x86_model_id[0])