From: Jason Self <j@jxself.org>
Date: Sat, 2 Apr 2022 21:37:08 +0000 (-0700)
Subject: 4.14.275: Set ARM64_ERRATUM_1188873=y and MITIGATE_SPECTRE_BRANCH_HISTORY=y
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=69fc0668c04c6f318317d39db9c3a676019f3522;p=kernel-configs.git

4.14.275: Set ARM64_ERRATUM_1188873=y and MITIGATE_SPECTRE_BRANCH_HISTORY=y
---

diff --git a/4.14/arm64 b/4.14/arm64
index 7824488..363ebf4 100644
--- a/4.14/arm64
+++ b/4.14/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.273-gnu1 Kernel Configuration
+# Linux/arm64 4.14.275-gnu1 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -535,6 +535,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
@@ -639,6 +640,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
 CONFIG_ARM64_SW_TTBR0_PAN=y