x86/CPU: Print family/model/stepping in hex
Borislav Petkov
maintainerPATCH 1/1 x86/CPU: Print family/model/stepping in hex
From: Borislav Petkov <[email protected]>
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".
--- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
@@ -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" );
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:x86/urgent] x86/cpu: Print family/model/stepping in hex
x86/cpu: Print family/model/stepping in hex
Commit-ID: 7c5b190e115a2f7a51a85f261e7d7dca4b4bbe64 Gitweb: http://git.kernel.org/tip/7c5b190e115a2f7a51a85f261e7d7dca4b4bbe64 Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 10 Sep 2015 21:55:27 +0200 Committer: Ingo Molnar <[email protected]> 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".
--- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
@@ -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" );