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/config-vanilla.s390x | |
| 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/config-vanilla.s390x')
| -rw-r--r-- | main/linux-vanilla/config-vanilla.s390x | 8 |
1 files changed, 7 insertions, 1 deletions
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 |