The following commit has been merged into the x86/cpu branch of tip: Commit-ID: ac5e80e94f5c67d7053f50fc3faddab931707f0f Gitweb: https://git.kernel.org/tip/ac5e80e94f5c67d7053f50fc3faddab931707f0f Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Fri, 29 Mar 2024 08:11:27 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Sat, 30 Mar 2024 11:35:28 +01:00 x86/mce: Clean up TP_printk() output line of the 'mce_record' tracepoint - Only capitalize entries where that makes sense - Print separate values separately - Rename 'PROCESSOR' to vendor & CPUID Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Avadhut Naik <avadhut.naik@xxxxxxx> Cc: "Tony Luck" <tony.luck@xxxxxxxxx> Link: https://lore.kernel.org/r/ZgZpn/zbCJWYdL5y@xxxxxxxxx --- include/trace/events/mce.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/trace/events/mce.h b/include/trace/events/mce.h index 1391ada..9c4e121 100644 --- a/include/trace/events/mce.h +++ b/include/trace/events/mce.h @@ -55,15 +55,18 @@ TRACE_EVENT(mce_record, __entry->cpuvendor = m->cpuvendor; ), - TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR/MISC/SYND: %016Lx/%016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u, APIC: %x", + TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR: %016Lx, MISC: %016Lx, SYND: %016Lx, RIP: %02x:<%016Lx>, TSC: %llx, vendor: %u, CPUID: %x, time: %llu, socket: %u, APIC: %x", __entry->cpu, __entry->mcgcap, __entry->mcgstatus, __entry->bank, __entry->status, __entry->ipid, - __entry->addr, __entry->misc, __entry->synd, + __entry->addr, + __entry->misc, + __entry->synd, __entry->cs, __entry->ip, __entry->tsc, - __entry->cpuvendor, __entry->cpuid, + __entry->cpuvendor, + __entry->cpuid, __entry->walltime, __entry->socketid, __entry->apicid)