Up to 6.8.9

[packages/kernel.git] / kernel-x86.config

diff --git a/kernel-x86.config b/kernel-x86.config
index 00e0edadaf5694634f3a9cf749f77286404bd132..5637eb98248358aac3407e02464c0686ea8b5b66 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -72,7 +72,6 @@ PAGE_OFFSET i386=0xC0000000
 X86_5LEVEL x86=n
 X86_CPA_STATISTICS x86=y
 AMD_MEM_ENCRYPT x86=y
-AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
 NUMA x86_64=y
 AMD_NUMA x86=n
 X86_64_ACPI_NUMA x86_64=y
@@ -112,7 +111,7 @@ LEGACY_VSYSCALL_NONE all=n
 CMDLINE_BOOL x86=n
 STRICT_SIGALTSTACK_SIZE all=y
 #- file kernel/livepatch/Kconfig goes here
-SPECULATION_MITIGATIONS x86=y
+CPU_MITIGATIONS x86=y x86_64=y
 PAGE_TABLE_ISOLATION all=y
 RETPOLINE x86=y
 RETHUNK x86=n x86_64=y
@@ -123,6 +122,7 @@ CPU_SRSO x86_64=y
 SLS x86_64=y
 GDS_FORCE_MITIGATION x86_64=n x86=n
 MITIGATION_RFDS x86_64=y
+MITIGATION_SPECTRE_BHI x86=y x86_64=y
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
@@ -257,8 +257,10 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
 KEXEC_JUMP x86=y
 MICROCODE_AMD x86=y
 MICROCODE_INTEL x86=y
+SPECULATION_MITIGATIONS x86=y