aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/config-vanilla.s390x
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-11-21 10:54:39 +0200
committerTimo Teräs <timo.teras@iki.fi>2017-11-21 10:54:39 +0200
commit9178c4fa924ac19ccae7d3e26b54751fe84c6036 (patch)
tree6ca1ad7a09b8c7adb826b1a45875ee94bee54ac0 /main/linux-vanilla/config-vanilla.s390x
parent02a4ca2fd9ae2f3df7aa5053150f9d555fcc44d5 (diff)
main/linux-vanilla: fix s390x config
Diffstat (limited to 'main/linux-vanilla/config-vanilla.s390x')
-rw-r--r--main/linux-vanilla/config-vanilla.s390x13
1 files changed, 4 insertions, 9 deletions
diff --git a/main/linux-vanilla/config-vanilla.s390x b/main/linux-vanilla/config-vanilla.s390x
index 81ef1b5120b..b10273bb67d 100644
--- a/main/linux-vanilla/config-vanilla.s390x
+++ b/main/linux-vanilla/config-vanilla.s390x
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.9.14 Kernel Configuration
+# Linux/s390 4.9.63 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -178,7 +178,7 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
@@ -415,7 +415,6 @@ CONFIG_TUNE_ZEC12=y
CONFIG_64BIT=y
CONFIG_COMPAT=y
CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
CONFIG_SMP=y
CONFIG_NR_CPUS=256
CONFIG_HOTPLUG_CPU=y
@@ -2718,6 +2717,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
# Security options
#
CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
# CONFIG_PERSISTENT_KEYRINGS is not set
# CONFIG_BIG_KEYS is not set
CONFIG_TRUSTED_KEYS=m
@@ -2940,7 +2940,7 @@ CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
+CONFIG_LZ4_DECOMPRESS=m
CONFIG_XZ_DEC=y
# CONFIG_XZ_DEC_X86 is not set
# CONFIG_XZ_DEC_POWERPC is not set
@@ -2951,11 +2951,6 @@ CONFIG_XZ_DEC=y
# CONFIG_XZ_DEC_BCJ is not set
# CONFIG_XZ_DEC_TEST is not set
CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC8=y
CONFIG_TEXTSEARCH=y