From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753328AbbIMK6g (ORCPT ); Sun, 13 Sep 2015 06:58:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43282 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835AbbIMK6f (ORCPT ); Sun, 13 Sep 2015 06:58:35 -0400 Date: Sun, 13 Sep 2015 03:57:50 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: a.p.zijlstra@chello.nl, luto@amacapital.net, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, bp@suse.de Reply-To: linux-kernel@vger.kernel.org, luto@amacapital.net, a.p.zijlstra@chello.nl, bp@suse.de, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, torvalds@linux-foundation.org In-Reply-To: <1441914927-32037-1-git-send-email-bp@alien8.de> References: <1441914927-32037-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/cpu: Print family/model/stepping in hex Git-Commit-ID: 7c5b190e115a2f7a51a85f261e7d7dca4b4bbe64 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7c5b190e115a2f7a51a85f261e7d7dca4b4bbe64 Gitweb: http://git.kernel.org/tip/7c5b190e115a2f7a51a85f261e7d7dca4b4bbe64 Author: Borislav Petkov AuthorDate: Thu, 10 Sep 2015 21:55:27 +0200 Committer: Ingo Molnar CommitDate: Sun, 13 Sep 2015 09:30:07 +0200 x86/cpu: Print family/model/stepping in hex 924e101a7ab6 ("x86/debug: Dump family, model, stepping of the boot CPU") had its good intentions to dump the exact F/M/S as an aid during debugging sessions but its output can be ambiguous. Fix that: -smpboot: CPU0: Intel Core Processor (Broadwell) (fam: 06, model: 47, stepping: 02) +smpboot: CPU0: Intel Core Processor (Broadwell) (family: 0x6, model: 0x47, stepping: 0x2) Also, spell out "family". Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1441914927-32037-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 07ce52c..de22ea7 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1110,10 +1110,10 @@ void print_cpu_info(struct cpuinfo_x86 *c) else printk(KERN_CONT "%d86", c->x86); - printk(KERN_CONT " (fam: %02x, model: %02x", c->x86, c->x86_model); + printk(KERN_CONT " (family: 0x%x, model: 0x%x", c->x86, c->x86_model); if (c->x86_mask || c->cpuid_level >= 0) - printk(KERN_CONT ", stepping: %02x)\n", c->x86_mask); + printk(KERN_CONT ", stepping: 0x%x)\n", c->x86_mask); else printk(KERN_CONT ")\n");