X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.9%2Fs390x;h=829eaf30760068084d711d355961bc404ba9b81a;hb=c7cc9ca66b994bcee105ef682824dc9946528d6b;hp=736fb3dfb6c7ded9712fe60b7356cc918c605f3b;hpb=8c3a9b61096e6fb0f412af1ba9b805283f01b39e;p=kernel-configs.git

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