From 57d5ab8fdf5a1f674250d6f57d1145e13a854c61 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 10 Apr 2020 15:56:20 +0100 Subject: [PATCH] kernel: Tweak s390x config For some reason, the 'make ARCH=s390 oldconfig' yields a different config when executing on a real s390c system... Signed-off-by: Rolf Neugebauer --- kernel/config-5.6.x-s390x | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/kernel/config-5.6.x-s390x b/kernel/config-5.6.x-s390x index 92f864626..d6c45ee90 100644 --- a/kernel/config-5.6.x-s390x +++ b/kernel/config-5.6.x-s390x @@ -247,7 +247,29 @@ CONFIG_HAVE_LIVEPATCH=y # # Processor type and features # +CONFIG_HAVE_MARCH_Z900_FEATURES=y +CONFIG_HAVE_MARCH_Z990_FEATURES=y +CONFIG_HAVE_MARCH_Z9_109_FEATURES=y +CONFIG_HAVE_MARCH_Z10_FEATURES=y +CONFIG_HAVE_MARCH_Z196_FEATURES=y +# CONFIG_MARCH_Z900 is not set +# CONFIG_MARCH_Z990 is not set +# CONFIG_MARCH_Z9_109 is not set +# CONFIG_MARCH_Z10 is not set +CONFIG_MARCH_Z196=y +# CONFIG_MARCH_ZEC12 is not set +# CONFIG_MARCH_Z13 is not set +# CONFIG_MARCH_Z14 is not set +CONFIG_MARCH_Z196_TUNE=y CONFIG_TUNE_DEFAULT=y +# CONFIG_TUNE_Z900 is not set +# CONFIG_TUNE_Z990 is not set +# CONFIG_TUNE_Z9_109 is not set +# CONFIG_TUNE_Z10 is not set +# CONFIG_TUNE_Z196 is not set +# CONFIG_TUNE_ZEC12 is not set +# CONFIG_TUNE_Z13 is not set +# CONFIG_TUNE_Z14 is not set CONFIG_64BIT=y CONFIG_COMPAT=y CONFIG_SYSVIPC_COMPAT=y @@ -418,7 +440,6 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y -CONFIG_CPU_NO_EFFICIENT_FFS=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -1235,6 +1256,7 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y +# CONFIG_BPF_JIT is not set # CONFIG_BPF_STREAM_PARSER is not set CONFIG_NET_FLOW_LIMIT=y @@ -1270,6 +1292,7 @@ CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y CONFIG_FAILOVER=y CONFIG_ETHTOOL_NETLINK=y +CONFIG_HAVE_EBPF_JIT=y # # Device Drivers