diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2011-10-17 16:45:10 +0200 |
|---|---|---|
| committer | Borislav Petkov <borislav.petkov@amd.com> | 2011-10-19 15:47:48 +0200 |
| commit | 881e23e56764808e7ab1ed73b5d8a6700042ea38 (patch) | |
| tree | a0c0bd32d317402a452949bca1638bbf4646fcde /arch/x86 | |
| parent | ca8bc8dc044793ee4d59ff7fe40138eee27d0325 (diff) | |
| download | linux-881e23e56764808e7ab1ed73b5d8a6700042ea38.tar.bz2 | |
x86, microcode: Correct microcode revision format
506ed6b53e00 ("x86, intel: Output microcode revision in /proc/cpuinfo")
added microcode revision format to /proc/cpuinfo and the MCE handler in
decimal format but both AMD and Intel patch levels are handled as hex
numbers. Fix it.
Acked-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/proc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 8af6fa473233..ad8d8973a396 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -221,7 +221,7 @@ static void print_mce(struct mce *m) * Note this output is parsed by external tools and old fields * should not be changed. */ - pr_emerg(HW_ERR "PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x microcode %u\n", + pr_emerg(HW_ERR "PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x microcode %x\n", m->cpuvendor, m->cpuid, m->time, m->socketid, m->apicid, cpu_data(m->extcpu).microcode); diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index 6254fdae3e77..14b23140e81f 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -86,7 +86,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) else seq_printf(m, "stepping\t: unknown\n"); if (c->microcode) - seq_printf(m, "microcode\t: %u\n", c->microcode); + seq_printf(m, "microcode\t: 0x%x\n", c->microcode); if (cpu_has(c, X86_FEATURE_TSC)) { unsigned int freq = cpufreq_quick_get(cpu); |