From 1ba03c14ab2f258421b902b1bd5859c1b8f38bea Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 19 Sep 2008 18:41:16 -0700 Subject: [PATCH] --- yaml --- r: 113523 b: refs/heads/master c: bd32a8cfa8f172bd943655a3663d8005e5c1d83c h: refs/heads/master i: 113521: ba59516ffc9350ea555521fc348ab65d0cdc7c91 113519: a1b87070a087305032c4195af43608f4d74b9558 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3185f68d259d..4e9eb4ea02a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 606ee44dbb72fd48beb47f171d7b9cecf6ade6dd +refs/heads/master: bd32a8cfa8f172bd943655a3663d8005e5c1d83c diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c index fb789dd9e691..088fbdb6734e 100644 --- a/trunk/arch/x86/kernel/cpu/common.c +++ b/trunk/arch/x86/kernel/cpu/common.c @@ -797,7 +797,7 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) else if (c->cpuid_level >= 0) vendor = c->x86_vendor_id; - if (vendor && strncmp(c->x86_model_id, vendor, strlen(vendor))) + if (vendor && !strstr(c->x86_model_id, vendor)) printk(KERN_CONT "%s ", vendor); if (c->x86_model_id[0])