From 6bfba4e85ca956e20d2149d01dad58451d1b212b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 24 Jul 2018 13:13:42 +0100 Subject: [PATCH] kernel: Adjust arm64 kernel config to upstream changes Signed-off-by: Rolf Neugebauer --- kernel/config-4.14.x-aarch64 | 1 + kernel/config-4.17.x-aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index 781a23288..9f25dbfed 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -574,6 +574,7 @@ CONFIG_XEN=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set # diff --git a/kernel/config-4.17.x-aarch64 b/kernel/config-4.17.x-aarch64 index 7565b2f2a..4c4636e58 100644 --- a/kernel/config-4.17.x-aarch64 +++ b/kernel/config-4.17.x-aarch64 @@ -580,6 +580,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_EL2_VECTORS=y +CONFIG_ARM64_SSBD=y # CONFIG_ARM64_SW_TTBR0_PAN is not set #