kernel: Enable KAISER and Hardened Branch predictor for arm64

These are part of the Meltdown/Spectre mitigations for arm64
now available for 4.14 and 4.15

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-02-19 14:23:31 +00:00
parent 231cead2cc
commit 1e9b769d65
2 changed files with 5 additions and 0 deletions

View File

@ -495,6 +495,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y
CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1003=y
CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y
CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y
CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
CONFIG_ARM64_4K_PAGES=y CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_16K_PAGES is not set # CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set # CONFIG_ARM64_64K_PAGES is not set
@ -570,6 +571,8 @@ CONFIG_PARAVIRT=y
CONFIG_XEN_DOM0=y CONFIG_XEN_DOM0=y
CONFIG_XEN=y CONFIG_XEN=y
CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set
# #

View File

@ -581,6 +581,8 @@ CONFIG_PARAVIRT=y
CONFIG_XEN_DOM0=y CONFIG_XEN_DOM0=y
CONFIG_XEN=y CONFIG_XEN=y
CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set
# #