aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-04-26 21:16:12 +0200
committerMathias Kresin <dev@kresin.me>2018-04-27 21:34:00 +0200
commit25f47c7bf938fd934575015fd032d0145806c3f7 (patch)
treefb54076c267dd2c2d6cbade22481f84d17d0fc36 /target/linux/layerscape
parent6fa88be4868836e77b7472dcdde0aeb4f78f8203 (diff)
downloadupstream-25f47c7bf938fd934575015fd032d0145806c3f7.tar.gz
upstream-25f47c7bf938fd934575015fd032d0145806c3f7.tar.bz2
upstream-25f47c7bf938fd934575015fd032d0145806c3f7.zip
kernel: add missing config symbols
The harden branch predictor was backported for arm64 with 4.9.92-96. Fixes: 9aa196e0f260 ("kernel: bump 4.9 to bump 4.9.96") Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/armv8_64b/config-4.92
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/layerscape/armv8_64b/config-4.9 b/target/linux/layerscape/armv8_64b/config-4.9
index 976006ca44..c4c325acfb 100644
--- a/target/linux/layerscape/armv8_64b/config-4.9
+++ b/target/linux/layerscape/armv8_64b/config-4.9
@@ -530,6 +530,7 @@ CONFIG_GPIO_PL061=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_XGENE=y
CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y
@@ -1154,6 +1155,7 @@ CONFIG_UIO_PDRV_GENIRQ=y
CONFIG_UIO_SERCOS3=y
CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_UNIX_DIAG=y
+CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_USB_SUPPORT=y
# CONFIG_USERIO is not set
CONFIG_USER_NS=y