From 1896951b04031a3fd0599eaefeef9c9153a3c957 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 17 Jul 2018 14:35:44 +0100 Subject: [PATCH] kernel: Tweak config for x86 Signed-off-by: Rolf Neugebauer --- kernel/config-4.14.x-x86_64 | 1 - kernel/config-4.17.x-x86_64 | 1 - kernel/config-4.4.x-x86_64 | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index d558eed49..c4e8a68c8 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -4056,7 +4056,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=y CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=y -CONFIG_CRYPTO_SALSA20_X86_64=y CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_SEED=y diff --git a/kernel/config-4.17.x-x86_64 b/kernel/config-4.17.x-x86_64 index e472d2644..0263d0f63 100644 --- a/kernel/config-4.17.x-x86_64 +++ b/kernel/config-4.17.x-x86_64 @@ -4049,7 +4049,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=y CONFIG_CRYPTO_FCRYPT=y CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_SALSA20=y -CONFIG_CRYPTO_SALSA20_X86_64=y CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_SEED=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index 96e6adfd7..73796a1e0 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -376,6 +376,7 @@ CONFIG_FREEZER=y CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_FAST_FEATURE_TESTS=y # CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=y CONFIG_RETPOLINE=y @@ -3461,7 +3462,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_ENTRY is not set # CONFIG_DEBUG_NMI_SELFTEST is not set -# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set CONFIG_X86_DEBUG_FPU=y # CONFIG_PUNIT_ATOM_DEBUG is not set