Update s390x to reduce system requirements and be compatible with more mainframe...

[kernel-configs.git] / 4.4 / s390x

diff --git a/4.4/s390x b/4.4/s390x
index 8c1b8829aba0496ca5a8ff70475393daf6666aa9..4fba3734d45a077333244d8386cb2fa7582b43f9 100644 (file)
--- 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