kernel: generic: add missing symbol for arm64 spectre mitigation
authorPetr Štetiar <ynezz@true.cz>
Wed, 6 Apr 2022 17:58:56 +0000 (19:58 +0200)
committerPetr Štetiar <ynezz@true.cz>
Wed, 6 Apr 2022 17:58:56 +0000 (19:58 +0200)
Upstream in commit 3e3904125fcc ("arm64: Mitigate spectre style branch
history side channels") introduced new config symbol
MITIGATE_SPECTRE_BRANCH_HISTORY which I missed in commit d39a6c67dcb4
("kernel: bump 4.14 to 4.14.275") and buildworkers for arm64 targets
started complaining:

 Mitigate Spectre style attacks against branch history (MITIGATE_SPECTRE_BRANCH_HISTORY) [Y/n/?] (NEW) aborted!

Fixes: d39a6c67dcb4 ("kernel: bump 4.14 to 4.14.275")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
target/linux/generic/config-4.14

index b8a570b9c18c068107a2e7bc7ae3f7e530b8a07c..a0569e4eb0e1249880864563ee980fadcbcc4ac6 100644 (file)
@@ -2678,6 +2678,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN_NETJET is not set
 # CONFIG_MISDN_SPEEDFAX is not set
 # CONFIG_MISDN_W6692 is not set
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MKISS is not set
 # CONFIG_MLX4_CORE is not set
 # CONFIG_MLX4_EN is not set