diff options
-rw-r--r-- | arch/x86/kernel/cpu/common_64.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index 6475548d64eb..68b06a39dcac 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c | |||
@@ -730,8 +730,20 @@ __setup("noclflush", setup_noclflush); | |||
730 | 730 | ||
731 | void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) | 731 | void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) |
732 | { | 732 | { |
733 | char *vendor = NULL; | ||
734 | |||
735 | if (c->x86_vendor < X86_VENDOR_NUM) | ||
736 | vendor = this_cpu->c_vendor; | ||
737 | else if (c->cpuid_level >= 0) | ||
738 | vendor = c->x86_vendor_id; | ||
739 | |||
740 | if (vendor && strncmp(c->x86_model_id, vendor, strlen(vendor))) | ||
741 | printk(KERN_CONT "%s ", vendor); | ||
742 | |||
733 | if (c->x86_model_id[0]) | 743 | if (c->x86_model_id[0]) |
734 | printk(KERN_CONT "%s", c->x86_model_id); | 744 | printk(KERN_CONT "%s", c->x86_model_id); |
745 | else | ||
746 | printk(KERN_CONT "%d86", c->x86); | ||
735 | 747 | ||
736 | if (c->x86_mask || c->cpuid_level >= 0) | 748 | if (c->x86_mask || c->cpuid_level >= 0) |
737 | printk(KERN_CONT " stepping %02x\n", c->x86_mask); | 749 | printk(KERN_CONT " stepping %02x\n", c->x86_mask); |