diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-11-21 10:54:39 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-11-21 10:54:39 +0200 |
| commit | 9178c4fa924ac19ccae7d3e26b54751fe84c6036 (patch) | |
| tree | 6ca1ad7a09b8c7adb826b1a45875ee94bee54ac0 | |
| parent | 02a4ca2fd9ae2f3df7aa5053150f9d555fcc44d5 (diff) | |
| download | aports-9178c4fa924ac19ccae7d3e26b54751fe84c6036.tar.bz2 aports-9178c4fa924ac19ccae7d3e26b54751fe84c6036.tar.xz | |
main/linux-vanilla: fix s390x config
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.s390x | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index b72844ae74..b1cc689bc9 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -180,5 +180,5 @@ d552c5ab3b128cb1b4185aaa3ed27cd92070c2ba5f414747730c1915da432d1f930f81543737b902 30a1ec682dd8df025151a7e76e83917d7ead6d2e730e85b0e87941f82dcb45f69afe928472e595997f373460f6c958b802c54663dab7ee9241ecaaf7cd13c769 config-vanilla.x86_64 ee565e219530bcfaf5cade2622432cfb83743bdbbfc388781901461f19ca553b7fdee3c81ce6b34225ef78a209eb60088630284fcbb0430947aad77a5d8a0865 config-vanilla.ppc 0d9104590a9da6723c071003ef9379235c2b74a284006badb323c4c1e6eafa88ae02910eb59b4bbd0ea0979ec99351c6bc4460d4c0c90e8e2dea831eddcc70d6 config-vanilla.ppc64le -040ded4603acd7d72227b8ea648876118f647d5750331c68419f057def3da4e751a13e8d73ae6d2f040e8a2eedd128415d9cf75420c1e3d5314910d11c705d95 config-vanilla.s390x +26969c1ed93cb88a8b12330a2984954d6c20ef973ef619cf92c0543ab075f4e3342c7d6275ccecd475c5b6129ccfdd6054b41f504bd82e14eb9cefbd74aa1b90 config-vanilla.s390x 51fa0a5c19989be5326130421afe29aeb22bc7be65adbe882fc32b0b22c414e8631e3e7cefb6fecfc23545851a19211f5feddd7196934f5c84ec507b4f2984c0 patch-4.9.63.xz" diff --git a/main/linux-vanilla/config-vanilla.s390x b/main/linux-vanilla/config-vanilla.s390x index 81ef1b5120..b10273bb67 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 |