From cfdde3da199386981eef932ba499a89ee6ce8e8c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:06:06 +0000
Subject: import mcelog-144-9.94d853b2ea81.el7


---

diff --git a/SOURCES/mcelog-patch-595a2dcfe.patch b/SOURCES/mcelog-patch-595a2dcfe.patch
new file mode 100644
index 0000000..e19d57c
--- /dev/null
+++ b/SOURCES/mcelog-patch-595a2dcfe.patch
@@ -0,0 +1,24 @@
+diff -urNp mcelog-d2e13bf0.orig/mcelog.c mcelog-d2e13bf0/mcelog.c
+--- mcelog-d2e13bf0.orig/mcelog.c	2018-06-28 11:53:15.907862669 -0400
++++ mcelog-d2e13bf0/mcelog.c	2018-06-28 11:54:56.247852219 -0400
+@@ -446,6 +446,9 @@ static void dump_mce(struct mce *m, unsi
+ 	if (recordlen >= offsetof(struct mce, ppin) && m->ppin)
+ 		n += Wprintf("PPIN %llx\n", m->ppin);
+ 
++	if (recordlen > offsetof(struct mce, microcode) && m->microcode)
++		n += Wprintf("MICROCODE %x\n", m->microcode);
++
+ 	if (recordlen >= offsetof(struct mce, cpuid) && m->cpuid) {
+ 		u32 fam, mod;
+ 		parse_cpuid(m->cpuid, &fam, &mod);
+diff -urNp mcelog-d2e13bf0.orig/mcelog.h mcelog-d2e13bf0/mcelog.h
+--- mcelog-d2e13bf0.orig/mcelog.h	2018-06-28 11:53:15.908862699 -0400
++++ mcelog-d2e13bf0/mcelog.h	2018-06-28 11:54:04.754318009 -0400
+@@ -34,6 +34,7 @@ struct mce {
+ 	__u64 synd;	/* MCA_SYND MSR: only valid on SMCA systems */
+ 	__u64 ipid;	/* MCA_IPID MSR: only valid on SMCA systems */
+ 	__u64 ppin;	/* Protected Processor Inventory Number */
++	__u32 microcode;/* Microcode revision */
+ };
+ 
+ #define X86_VENDOR_INTEL	0
diff --git a/SPECS/mcelog.spec b/SPECS/mcelog.spec
index 844b6bc..c27da1a 100644
--- a/SPECS/mcelog.spec
+++ b/SPECS/mcelog.spec
@@ -4,7 +4,7 @@
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
 Version:	144
-Release:	8.%{last_git_commit}%{?dist}
+Release:	9.%{last_git_commit}%{?dist}
 Epoch:		3
 Group:		System Environment/Base
 License:	GPLv2
@@ -26,11 +26,12 @@ Patch7:		mcelog-update-e4aca63.patch
 Patch8:		mcelog-update-94d853b2ea81.patch
 Patch9:		mcelog-patch-e9aeed03f3d1.patch
 Patch10:	mcelog-patch-cfa11588ad8b.patch
-# Patches 11-14 below can be removed on the next full code update.
+# Patches 11-15 below can be removed on the next full code update.
 Patch11:	mcelog-patch-commit-916015663906.patch
 Patch12:	mcelog-patch-0755b55af.patch
 Patch13:	mcelog-patch-59b8cab3f.patch
 Patch14:	mcelog-patch-f8f1490cb.patch
+Patch15:	mcelog-patch-595a2dcfe.patch
 URL:		https://github.com/andikleen/mcelog.git
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	i686 x86_64
@@ -60,6 +61,7 @@ on x86-32 and x86-64 systems. It can be run either as a daemon, or by cron.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
@@ -131,6 +133,8 @@ fi
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Jun 29 2018 Prarit Bhargava <prarit@redhat.com> - 3:144.9.94d853b2ea81
+- Print microcode version when the kernel provides it [1593109]
 * Tue Oct 17 2017 Prarit Bhargava <prarit@redhat.com> - 3:144.8.94d853b2ea81
 - Fix typo in spec file for .os_version[1454419]
 * Tue Oct 17 2017 Prarit Bhargava <prarit@redhat.com> - 3:144.7.94d853b2ea81