main/linux-vanilla: error event reporting and EDAC

Enable features needed by rasdaemon

2 files changed, 42 insertions, 5 deletions

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index f45ed029b1..d250cc01e6 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux vanilla kernel"
 url="http://kernel.org"
 depends="mkinitfs"
@@ -226,7 +226,7 @@ sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb6
 82391b4be50d36b80a1aab24b1d3783de7ec2badefd281f05684a6e8243c6e48848c6db30ca05c0fc820cb3570430d8e5f31e4dac9a3ba08c35a8f15a67fe462  config-vanilla.armhf
 82391b4be50d36b80a1aab24b1d3783de7ec2badefd281f05684a6e8243c6e48848c6db30ca05c0fc820cb3570430d8e5f31e4dac9a3ba08c35a8f15a67fe462  config-vanilla.armv7
 cd53837102090d1fe1f704f505dc7f7b0577bcbf52ee9b7e7c1fcbffb081066a4cd0cbfc1c54861d594460aabce1f6ab629e6e6885746e549b98bba2ed1663bc  config-vanilla.x86
-ef34a3481fd6ca137279521476289d98968984f5f5d61d3b3086fbbc86ec5622937f29804707cf53762827b6431eec41b03a5ff85923ae6dee05acdd5f576b7d  config-vanilla.x86_64
+8be2bd13c549057a2019c8b7f0adcd6cefb3e8d6dbbd3358e5da62664bad579c82b8169d664e8f646b55d3b751dc703b10d166e3e88cb584cce8383348530242  config-vanilla.x86_64
 96651aca476c905c04d616565a2dd08066167c1d4887e2ddc86c4b7cdda44257ef633a9bcf745a91f00f88023dde8f1804c56b258e7e99232bb8bfa25d0ba4db  config-vanilla.ppc
 502825e58e17eeff446bdd63d47ba610424f366f60676e0aa61f5216f531e1a836e19b3a97a9494c4c58dafa81c5379c2ab9b19bad9aa869261969dd97a1f6ee  config-vanilla.ppc64le
 6a18cf89e5ccddb98dcd04936fa4f2ee512ab93b91a121648d4cc8a23b66c14aa26a4b914a828a4c32832a663e1bec2ad0d9127121117c2fe17f2dcbd4bbd04c  config-vanilla.s390x
diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64
index 3c040a2c10..c3778ea0b1 100644
--- a/main/linux-vanilla/config-vanilla.x86_64
+++ b/main/linux-vanilla/config-vanilla.x86_64
@@ -291,6 +291,7 @@ CONFIG_X86_INTEL_LPSS=y
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
@@ -344,7 +345,13 @@ CONFIG_SCHED_MC_PRIO=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-# CONFIG_X86_MCE is not set
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
 
 #
 # Performance monitoring
@@ -491,10 +498,12 @@ CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
 # CONFIG_ACPI_APEI_GHES is not set
+CONFIG_ACPI_APEI_PCIEAER=y
 # CONFIG_ACPI_APEI_EINJ is not set
 CONFIG_ACPI_APEI_ERST_DEBUG=y
 CONFIG_DPTF_POWER=m
 CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=y
 CONFIG_PMIC_OPREGION=y
 # CONFIG_CHT_DC_TI_PMIC_OPREGION is not set
 CONFIG_ACPI_CONFIGFS=m
@@ -558,7 +567,9 @@ CONFIG_MMCONF_FAM10H=y
 CONFIG_PCI_CNB20LE_QUIRK=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
-# CONFIG_PCIEAER is not set
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
@@ -566,6 +577,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -931,6 +943,8 @@ CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
@@ -4118,6 +4132,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 # CONFIG_DEVFREQ_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_INTEL_POWERCLAMP is not set
+CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 
@@ -6084,6 +6099,26 @@ CONFIG_INFINIBAND_HFI1=m
 # CONFIG_INFINIBAND_QEDR is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_DEBUG=y
+CONFIG_EDAC_DECODE_MCE=y
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_PND2=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_MC146818_LIB=y
 CONFIG_RTC_CLASS=y
@@ -6301,6 +6336,7 @@ CONFIG_XEN_PVCALLS_FRONTEND=m
 CONFIG_XEN_SCSI_BACKEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
 CONFIG_XEN_HAVE_PVMMU=y
 CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
@@ -6605,7 +6641,7 @@ CONFIG_GENERIC_PHY=y
 #
 # Performance monitor support
 #
-# CONFIG_RAS is not set
+CONFIG_RAS=y
 CONFIG_THUNDERBOLT=m
 
 #
@@ -7333,6 +7369,7 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set