From a5cdaedbe7a9190c8eeeecbb8f8447b1d6bc724a Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 17 Oct 2011 16:45:10 +0200 Subject: [PATCH] --- yaml --- r: 269537 b: refs/heads/master c: 881e23e56764808e7ab1ed73b5d8a6700042ea38 h: refs/heads/master i: 269535: d4e78d3b97c42f5700887bd9b11caeab40ed28a8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 2 +- trunk/arch/x86/kernel/cpu/proc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bce043081a32..0f7b5d0b5c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca8bc8dc044793ee4d59ff7fe40138eee27d0325 +refs/heads/master: 881e23e56764808e7ab1ed73b5d8a6700042ea38 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c index 8af6fa473233..ad8d8973a396 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c +++ b/trunk/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/trunk/arch/x86/kernel/cpu/proc.c b/trunk/arch/x86/kernel/cpu/proc.c index 6254fdae3e77..14b23140e81f 100644 --- a/trunk/arch/x86/kernel/cpu/proc.c +++ b/trunk/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);