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>

diff --git a/target/linux/brcm2708/bcm2710/config-4.9 b/target/linux/brcm2708/bcm2710/config-4.9
index b7a5ccf3db7189237ee502273022b3540b35f578..070b709a3ba6c2d921c61fcbe89e977a072c8673 100644 (file)
--- a/target/linux/brcm2708/bcm2710/config-4.9
+++ b/target/linux/brcm2708/bcm2710/config-4.9
@@ -59,8 +59,6 @@ CONFIG_ARM_BCM2835_CPUFREQ=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_PSCI_FW=y

-# CONFIG_ARM_SBSA_WATCHDOG is not set
-# CONFIG_ARM_SCPI_PROTOCOL is not set

 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_TIMER_SP804=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_TIMER_SP804=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y


@@ -181,7 +179,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FREEZER=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FREEZER=y
 CONFIG_FSL_ERRATUM_A008585=y

-# CONFIG_FSL_MC_BUS is not set

 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ALLOCATOR=y


@@ -209,6 +206,7 @@ CONFIG_GPIO_BCM_EXP=y
 CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y

+CONFIG_HARDEN_BRANCH_PREDICTOR=y

 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y


@@ -285,8 +283,6 @@ CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set

-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y

 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX=y
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX=y


@@ -381,7 +377,6 @@ CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=0
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=0
 CONFIG_SERIAL_8250_SHARE_IRQ=y

-# CONFIG_SERIAL_AMBA_PL010 is not set

 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y


@@ -411,6 +406,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TREE_RCU=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TREE_RCU=y
 CONFIG_UEVENT_HELPER_PATH=""

+CONFIG_UNMAP_KERNEL_AT_EL0=y

 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_COMMON=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_COMMON=y

diff --git a/target/linux/layerscape/armv8_64b/config-4.9 b/target/linux/layerscape/armv8_64b/config-4.9
index 976006ca44811c3038e190b20c2399571b8d8455..c4c325acfbeb8adfe52f70e4e1ed6c14ff0744f1 100644 (file)
--- 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_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
 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_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
 CONFIG_USB_SUPPORT=y
 # CONFIG_USERIO is not set
 CONFIG_USER_NS=y