From b22d4000a35834b637ed7d99f4ea710cc016d001 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Mon, 30 Apr 2018 13:34:11 +0100
Subject: [PATCH] kernel: Adjust s390x kernel config

the 4.14.38 kernel backported the Spectre mitigation requiring
a change of the kernel config.

Might as well enabled the mitigations by default.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 kernel/config-4.14.x-s390x | 6 ++++++
 kernel/config-4.16.x-s390x | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/kernel/config-4.14.x-s390x b/kernel/config-4.14.x-s390x
index 72d5e3b75..520334495 100644
--- a/kernel/config-4.14.x-s390x
+++ b/kernel/config-4.14.x-s390x
@@ -466,6 +466,11 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_RANDOM=y
+CONFIG_KERNEL_NOBP=y
+CONFIG_EXPOLINE=y
+# CONFIG_EXPOLINE_OFF is not set
+# CONFIG_EXPOLINE_AUTO is not set
+CONFIG_EXPOLINE_FULL=y
 
 #
 # Memory setup
@@ -1241,6 +1246,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_SYS_HYPERVISOR=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 # CONFIG_DMA_SHARED_BUFFER is not set
 # CONFIG_DMA_CMA is not set
 
diff --git a/kernel/config-4.16.x-s390x b/kernel/config-4.16.x-s390x
index 46bec2796..2a4ca8c5a 100644
--- a/kernel/config-4.16.x-s390x
+++ b/kernel/config-4.16.x-s390x
@@ -474,8 +474,11 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_RANDOM=y
-# CONFIG_KERNEL_NOBP is not set
-# CONFIG_EXPOLINE is not set
+CONFIG_KERNEL_NOBP=y
+CONFIG_EXPOLINE=y
+# CONFIG_EXPOLINE_OFF is not set
+# CONFIG_EXPOLINE_MEDIUM is not set
+CONFIG_EXPOLINE_FULL=y
 
 #
 # Memory setup