diff options
| author | Tuan M. Hoang <tmhoang@flatglobe.org> | 2018-04-30 15:16:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-05-01 07:38:09 +0000 |
| commit | 7c32ada9ec3f0eb6a385822c9ac3a3abf582adb1 (patch) | |
| tree | a8d567c2333d20a8d9a504554a70bd87095083f7 /main/linux-vanilla | |
| parent | 47bd50a950f32db3bd14e779c54c29a275738fa5 (diff) | |
| download | aports-7c32ada9ec3f0eb6a385822c9ac3a3abf582adb1.tar.bz2 aports-7c32ada9ec3f0eb6a385822c9ac3a3abf582adb1.tar.xz | |
main/linux-vanilla: spectre v2 on s390x
build fix for s390x
commit 6e179d64126b909f0b288fa63cdbf07c531e9b1d allows either nobp or
expolines
Diffstat (limited to 'main/linux-vanilla')
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.s390x | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 3e6c744689..ab27367460 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -228,7 +228,7 @@ dd0a6de85b4273960a20533f2080773f9a5bf6f102ba4b5e59304d99bbc437f2cabcb6d5b5e22189 32de8b93b6c1e31058661d8d5b725159c8dcf30b91e30d52493fd3a0582e13050b5b59c98442c501f17220442ff9f7dec68a252c8056ce5903c2f5cd29e160d6 config-vanilla.x86_64 03a14f009996319fc24fc1a4eae26e250f7cf6213bcdce0f82c3d0b4b54b81517f55e0445df0460d30f6b61f22519f04ac219ce3017c7cf72acd14c43e781a8b config-vanilla.ppc e45f9e547ba193e2096e71b0e4a4632252eecfcc593b87446f31cd97a4e4792ab36b270e1c5f6c42d8f53a0e46b3239cd437fcec36e4c20ca98033b551bcad24 config-vanilla.ppc64le -c71e6cae9f004cca3870b78b57ddbbd86b760d01128e7f4275433d36bb5351a353e05a82ef2659ae6a6da7ff3741c744dfa3b452bb72aac5a59ff852836b5c22 config-vanilla.s390x +10ecea3e0a101a898e347a42d74f9a3d8f226153cf487e1d65f59fb557b6fdaccab0d2ad6cf705c6cdeb5ed053eb7c5edecc655b3700e4ba237e965c0b6e417e config-vanilla.s390x 408a37fdf7dd467c1a874b0de54e72379378e2f4338a964fe2a50d80ddbb8916cb3bd23f000c6f57727384a24e011e06d5f4af6017453391e4cc60fd57892bda config-virt.x86 c6a7e5f405739856ceab097f878bcf102597ba33a375b8270ba1f0c59784204a587e0d0dbbbd1cd0fc52829552bf147019f7590bdc7034a0881ef5b327c40013 config-virt.x86_64 735e7f55776a2d0fea3d626c98b8eef1e803d6e0edbfc74212f9ada7c1fc9bca45b0aade4418860ef21feef4af39e774855877f3d3c354c3fe842447525d9750 patch-4.14.38.xz" diff --git a/main/linux-vanilla/config-vanilla.s390x b/main/linux-vanilla/config-vanilla.s390x index 2619365448..f1273d235e 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.14.16 Kernel Configuration +# Linux/s390 4.14.38 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y @@ -480,6 +480,11 @@ CONFIG_HZ_100=y CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_RANDOM=y +CONFIG_KERNEL_NOBP=y +CONFIG_EXPOLINE=y +# CONFIG_EXPOLINE_OFF is not set +CONFIG_EXPOLINE_AUTO=y +# CONFIG_EXPOLINE_FULL is not set # # Memory setup @@ -1335,6 +1340,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_DMA_FENCE_TRACE is not set # CONFIG_DMA_CMA is not set |