From 3ad3e85b014ad25bcaaf1a91774f3c39a3d1987b Mon Sep 17 00:00:00 2001 From: Jason Self Date: Sat, 12 Dec 2020 10:04:57 -0800 Subject: [PATCH] Update s390x to reduce system requirements and be compatible with more mainframe models --- 4.14/s390x | 27 ++++++++++++--------------- 4.19/s390x | 19 ++++++------------- 4.4/s390x | 26 +++++++++++--------------- 4.9/s390x | 27 ++++++++++++--------------- 5.4/s390x | 22 +++++++--------------- 5.9/s390x | 22 ++++++---------------- 6 files changed, 54 insertions(+), 89 deletions(-) diff --git a/4.14/s390x b/4.14/s390x index b5d9056..e4f071f 100644 --- a/4.14/s390x +++ b/4.14/s390x @@ -187,7 +187,6 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_BPF_SYSCALL=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -266,7 +265,7 @@ CONFIG_CLONE_BACKWARDS2=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_OLD_SIGACTION=y -# CONFIG_CPU_NO_EFFICIENT_FFS is not set +CONFIG_CPU_NO_EFFICIENT_FFS=y # CONFIG_HAVE_ARCH_VMAP_STACK is not set # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set @@ -431,36 +430,36 @@ CONFIG_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_HAVE_MARCH_ZEC12_FEATURES=y +# CONFIG_HAVE_MARCH_Z990_FEATURES is not set +# CONFIG_HAVE_MARCH_Z9_109_FEATURES is not set +# CONFIG_HAVE_MARCH_Z10_FEATURES is not set +# CONFIG_HAVE_MARCH_Z196_FEATURES is not set +# CONFIG_HAVE_MARCH_ZEC12_FEATURES is not set # CONFIG_HAVE_MARCH_Z13_FEATURES is not set # CONFIG_HAVE_MARCH_Z14_FEATURES is not set -# CONFIG_MARCH_Z900 is not set +CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z196 is not set -CONFIG_MARCH_ZEC12=y +# CONFIG_MARCH_ZEC12 is not set # CONFIG_MARCH_Z13 is not set # CONFIG_MARCH_Z14 is not set -# CONFIG_MARCH_Z900_TUNE is not set +CONFIG_MARCH_Z900_TUNE=y # CONFIG_MARCH_Z990_TUNE is not set # CONFIG_MARCH_Z9_109_TUNE is not set # CONFIG_MARCH_Z10_TUNE is not set # CONFIG_MARCH_Z196_TUNE is not set -CONFIG_MARCH_ZEC12_TUNE=y +# CONFIG_MARCH_ZEC12_TUNE is not set # CONFIG_MARCH_Z13_TUNE is not set # CONFIG_MARCH_Z14_TUNE is not set # CONFIG_TUNE_DEFAULT is not set -# CONFIG_TUNE_Z900 is not set +CONFIG_TUNE_Z900=y # 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=y +# CONFIG_TUNE_ZEC12 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set CONFIG_64BIT=y @@ -1287,7 +1286,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y @@ -1325,7 +1323,6 @@ CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y CONFIG_NET_DEVLINK=m CONFIG_MAY_USE_DEVLINK=m -CONFIG_HAVE_EBPF_JIT=y # CONFIG_PCMCIA is not set CONFIG_CCW=y diff --git a/4.19/s390x b/4.19/s390x index 16a0105..354e3f6 100644 --- a/4.19/s390x +++ b/4.19/s390x @@ -181,7 +181,6 @@ CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_USERFAULTFD=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set @@ -233,27 +232,22 @@ CONFIG_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_HAVE_MARCH_ZEC12_FEATURES=y -# CONFIG_MARCH_Z900 is not set +CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z196 is not set -CONFIG_MARCH_ZEC12=y +# CONFIG_MARCH_ZEC12 is not set # CONFIG_MARCH_Z13 is not set # CONFIG_MARCH_Z14 is not set -CONFIG_MARCH_ZEC12_TUNE=y +CONFIG_MARCH_Z900_TUNE=y # CONFIG_TUNE_DEFAULT is not set -# CONFIG_TUNE_Z900 is not set +CONFIG_TUNE_Z900=y # 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=y +# CONFIG_TUNE_ZEC12 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set CONFIG_64BIT=y @@ -483,6 +477,7 @@ 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_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y @@ -1355,7 +1350,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y @@ -1395,7 +1389,6 @@ CONFIG_NET_DEVLINK=m CONFIG_MAY_USE_DEVLINK=m CONFIG_PAGE_POOL=y CONFIG_FAILOVER=m -CONFIG_HAVE_EBPF_JIT=y # # Device Drivers diff --git a/4.4/s390x b/4.4/s390x index 8c1b882..4fba373 100644 --- a/4.4/s390x +++ b/4.4/s390x @@ -173,7 +173,6 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -377,33 +376,33 @@ CONFIG_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_HAVE_MARCH_ZEC12_FEATURES=y +# CONFIG_HAVE_MARCH_Z990_FEATURES is not set +# CONFIG_HAVE_MARCH_Z9_109_FEATURES is not set +# CONFIG_HAVE_MARCH_Z10_FEATURES is not set +# CONFIG_HAVE_MARCH_Z196_FEATURES is not set +# CONFIG_HAVE_MARCH_ZEC12_FEATURES is not set # CONFIG_HAVE_MARCH_Z13_FEATURES is not set -# CONFIG_MARCH_Z900 is not set +CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z196 is not set -CONFIG_MARCH_ZEC12=y +# CONFIG_MARCH_ZEC12 is not set # CONFIG_MARCH_Z13 is not set -# CONFIG_MARCH_Z900_TUNE is not set +CONFIG_MARCH_Z900_TUNE=y # CONFIG_MARCH_Z990_TUNE is not set # CONFIG_MARCH_Z9_109_TUNE is not set # CONFIG_MARCH_Z10_TUNE is not set # CONFIG_MARCH_Z196_TUNE is not set -CONFIG_MARCH_ZEC12_TUNE=y +# CONFIG_MARCH_ZEC12_TUNE is not set # CONFIG_MARCH_Z13_TUNE is not set # CONFIG_TUNE_DEFAULT is not set -# CONFIG_TUNE_Z900 is not set +CONFIG_TUNE_Z900=y # 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=y +# CONFIG_TUNE_ZEC12 is not set # CONFIG_TUNE_Z13 is not set CONFIG_64BIT=y CONFIG_COMPAT=y @@ -1155,7 +1154,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_NET_FLOW_LIMIT=y # @@ -1182,8 +1180,6 @@ CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y # CONFIG_NFC is not set CONFIG_LWTUNNEL=y CONFIG_DST_CACHE=y -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_EBPF_JIT=y # CONFIG_PCMCIA is not set CONFIG_CCW=y diff --git a/4.9/s390x b/4.9/s390x index 0a2e3ee..be380e4 100644 --- a/4.9/s390x +++ b/4.9/s390x @@ -181,7 +181,6 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_BPF_SYSCALL=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -250,7 +249,7 @@ CONFIG_CLONE_BACKWARDS2=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_OLD_SIGACTION=y -# CONFIG_CPU_NO_EFFICIENT_FFS is not set +CONFIG_CPU_NO_EFFICIENT_FFS=y # CONFIG_HAVE_ARCH_VMAP_STACK is not set # @@ -394,33 +393,33 @@ CONFIG_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_HAVE_MARCH_ZEC12_FEATURES=y +# CONFIG_HAVE_MARCH_Z990_FEATURES is not set +# CONFIG_HAVE_MARCH_Z9_109_FEATURES is not set +# CONFIG_HAVE_MARCH_Z10_FEATURES is not set +# CONFIG_HAVE_MARCH_Z196_FEATURES is not set +# CONFIG_HAVE_MARCH_ZEC12_FEATURES is not set # CONFIG_HAVE_MARCH_Z13_FEATURES is not set -# CONFIG_MARCH_Z900 is not set +CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z196 is not set -CONFIG_MARCH_ZEC12=y +# CONFIG_MARCH_ZEC12 is not set # CONFIG_MARCH_Z13 is not set -# CONFIG_MARCH_Z900_TUNE is not set +CONFIG_MARCH_Z900_TUNE=y # CONFIG_MARCH_Z990_TUNE is not set # CONFIG_MARCH_Z9_109_TUNE is not set # CONFIG_MARCH_Z10_TUNE is not set # CONFIG_MARCH_Z196_TUNE is not set -CONFIG_MARCH_ZEC12_TUNE=y +# CONFIG_MARCH_ZEC12_TUNE is not set # CONFIG_MARCH_Z13_TUNE is not set # CONFIG_TUNE_DEFAULT is not set -# CONFIG_TUNE_Z900 is not set +CONFIG_TUNE_Z900=y # 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=y +# CONFIG_TUNE_ZEC12 is not set # CONFIG_TUNE_Z13 is not set CONFIG_64BIT=y CONFIG_COMPAT=y @@ -1199,7 +1198,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_NET_FLOW_LIMIT=y # @@ -1232,7 +1230,6 @@ CONFIG_LWTUNNEL=y CONFIG_DST_CACHE=y CONFIG_NET_DEVLINK=m CONFIG_MAY_USE_DEVLINK=m -CONFIG_HAVE_EBPF_JIT=y # CONFIG_PCMCIA is not set CONFIG_CCW=y diff --git a/5.4/s390x b/5.4/s390x index 86310db..d02a9b3 100644 --- a/5.4/s390x +++ b/5.4/s390x @@ -22,7 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT=" " +CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -197,7 +197,6 @@ CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_USERFAULTFD=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set @@ -253,24 +252,18 @@ CONFIG_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_HAVE_MARCH_ZEC12_FEATURES=y -CONFIG_HAVE_MARCH_Z13_FEATURES=y -# CONFIG_MARCH_Z900 is not set +CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z196 is not set # CONFIG_MARCH_ZEC12 is not set -CONFIG_MARCH_Z13=y +# CONFIG_MARCH_Z13 is not set # CONFIG_MARCH_Z14 is not set # CONFIG_MARCH_Z15 is not set -CONFIG_MARCH_Z15_TUNE=y +CONFIG_MARCH_Z900_TUNE=y # CONFIG_TUNE_DEFAULT is not set -# CONFIG_TUNE_Z900 is not set +CONFIG_TUNE_Z900=y # CONFIG_TUNE_Z990 is not set # CONFIG_TUNE_Z9_109 is not set # CONFIG_TUNE_Z10 is not set @@ -278,7 +271,7 @@ CONFIG_MARCH_Z15_TUNE=y # CONFIG_TUNE_ZEC12 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set -CONFIG_TUNE_Z15=y +# CONFIG_TUNE_Z15 is not set CONFIG_64BIT=y CONFIG_COMPAT=y CONFIG_COMPAT_VDSO=y @@ -457,6 +450,7 @@ CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_64BIT_TIME=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 @@ -1339,7 +1333,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y @@ -1382,7 +1375,6 @@ CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y CONFIG_FAILOVER=m -CONFIG_HAVE_EBPF_JIT=y # # Device Drivers diff --git a/5.9/s390x b/5.9/s390x index 736fb3d..829eaf3 100644 --- a/5.9/s390x +++ b/5.9/s390x @@ -202,11 +202,8 @@ CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y -# CONFIG_BPF_LSM is not set CONFIG_BPF_SYSCALL=y CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y -CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_USERFAULTFD=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set @@ -262,24 +259,18 @@ CONFIG_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_HAVE_MARCH_ZEC12_FEATURES=y -CONFIG_HAVE_MARCH_Z13_FEATURES=y -# CONFIG_MARCH_Z900 is not set +CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z10 is not set # CONFIG_MARCH_Z196 is not set # CONFIG_MARCH_ZEC12 is not set -CONFIG_MARCH_Z13=y +# CONFIG_MARCH_Z13 is not set # CONFIG_MARCH_Z14 is not set # CONFIG_MARCH_Z15 is not set -CONFIG_MARCH_Z15_TUNE=y +CONFIG_MARCH_Z900_TUNE=y # CONFIG_TUNE_DEFAULT is not set -# CONFIG_TUNE_Z900 is not set +CONFIG_TUNE_Z900=y # CONFIG_TUNE_Z990 is not set # CONFIG_TUNE_Z9_109 is not set # CONFIG_TUNE_Z10 is not set @@ -287,7 +278,7 @@ CONFIG_MARCH_Z15_TUNE=y # CONFIG_TUNE_ZEC12 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set -CONFIG_TUNE_Z15=y +# CONFIG_TUNE_Z15 is not set CONFIG_64BIT=y CONFIG_COMPAT=y CONFIG_SYSVIPC_COMPAT=y @@ -450,6 +441,7 @@ 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 @@ -1360,7 +1352,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y @@ -1404,7 +1395,6 @@ CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y -CONFIG_HAVE_EBPF_JIT=y # # Device Drivers -- 2.31.1