From: Petr Štetiar Date: Wed, 6 Apr 2022 17:58:56 +0000 (+0200) Subject: kernel: generic: add missing symbol for arm64 spectre mitigation X-Git-Tag: v19.07.10~3 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26a8be9c9814c1cc89d691332fd0768e5aeba179;p=openwrt%2Fstaging%2Fpepe2k.git kernel: generic: add missing symbol for arm64 spectre mitigation 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 --- diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index b8a570b9c1..a0569e4eb0 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -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