diff options
| author | Dan Horák <dan@danny.cz> | 2018-09-12 09:52:31 +0000 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2018-09-12 15:37:13 -0400 |
| commit | 539c77ed029666082b5c5c5c7701273891b06244 (patch) | |
| tree | d86827c88b2ed08d4441dd925aa5414b20d4f4ff | |
| parent | 720485d8edcb28d42989afc74d47274912ea8796 (diff) | |
| download | kernel-539c77ed029666082b5c5c5c7701273891b06244.tar.gz kernel-539c77ed029666082b5c5c5c7701273891b06244.tar.xz kernel-539c77ed029666082b5c5c5c7701273891b06244.zip | |
drop redundant spectre v2 mitigation (rhbz#1627915)
| -rw-r--r-- | configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 7 | ||||
| -rw-r--r-- | kernel-s390x.config | 7 |
6 files changed, 9 insertions, 10 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO new file mode 100644 index 000000000..465c4673e --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_AUTO @@ -0,0 +1 @@ +CONFIG_EXPOLINE_AUTO=y diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL new file mode 100644 index 000000000..b6ea26036 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_FULL @@ -0,0 +1 @@ +# CONFIG_EXPOLINE_FULL is not set diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM deleted file mode 100644 index 82c8370c3..000000000 --- a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXPOLINE_MEDIUM=y diff --git a/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP b/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP index b3c291602..dd71bbe4a 100644 --- a/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP +++ b/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP @@ -1 +1 @@ -CONFIG_KERNEL_NOBP=y +# CONFIG_KERNEL_NOBP is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index b1384a719..2eafc839c 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1384,9 +1384,8 @@ CONFIG_ETHERNET=y # CONFIG_EXOFS_DEBUG is not set # CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_AUTO is not set -CONFIG_EXPOLINE_FULL=y -CONFIG_EXPOLINE_MEDIUM=y +CONFIG_EXPOLINE_AUTO=y +# CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPOLINE=y CONFIG_EXPORTFS=y @@ -2486,7 +2485,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_NOBP=y +# CONFIG_KERNEL_NOBP is not set # CONFIG_KERNEL_UNCOMPRESSED is not set # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC_FILE=y diff --git a/kernel-s390x.config b/kernel-s390x.config index be6e6c954..dedf660da 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1371,9 +1371,8 @@ CONFIG_ETHERNET=y # CONFIG_EXOFS_DEBUG is not set # CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_AUTO is not set -CONFIG_EXPOLINE_FULL=y -CONFIG_EXPOLINE_MEDIUM=y +CONFIG_EXPOLINE_AUTO=y +# CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPOLINE=y CONFIG_EXPORTFS=y @@ -2463,7 +2462,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set -CONFIG_KERNEL_NOBP=y +# CONFIG_KERNEL_NOBP is not set # CONFIG_KERNEL_UNCOMPRESSED is not set # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC_FILE=y |