From 5e4539a96b938736cdb592b821ee05c75ddbee3c Mon Sep 17 00:00:00 2001 From: Jason Self Date: Tue, 12 Apr 2022 20:50:44 -0700 Subject: [PATCH] 4.9.310-gnu1: Set CONFIG_ARM64_ERRATUM_1188873=y and CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y --- 4.9/arm64 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/4.9/arm64 b/4.9/arm64 index 366e5b5..bcfbad8 100644 --- a/4.9/arm64 +++ b/4.9/arm64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.309-gnu1 Kernel Configuration +# Linux/arm64 4.9.310-gnu1 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -466,6 +466,7 @@ CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_ARM64_ERRATUM_1188873=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -559,6 +560,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_ARM64_SSBD=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_ARMV8_DEPRECATED is not set # @@ -7196,6 +7198,7 @@ CONFIG_DW_APB_TIMER=y CONFIG_DW_APB_TIMER_OF=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y CONFIG_FSL_ERRATUM_A008585=y CONFIG_ARM_TIMER_SP804=y # CONFIG_ATMEL_PIT is not set -- 2.31.1