X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel-x86.config;h=8593d38a13b49084b8369ff2a18e82eef3306773;hb=0b2f1d0032b0dccbd1647d3f036fe1d913fd3a44;hp=7f7c771fb02686b6cb6a97f084ffd1340d9cba04;hpb=22018b9d5471ed23af92d19906c7b9fc423dfbfb;p=packages%2Fkernel.git

diff --git a/kernel-x86.config b/kernel-x86.config
index 7f7c771f..8593d38a 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -62,8 +62,6 @@ X86_IOPL_IOPERM x86=y
 TOSHIBA i386=m
 X86_REBOOTFIXUPS i386=y
 MICROCODE all=y
-MICROCODE_INTEL x86=y
-MICROCODE_AMD x86=y
 MICROCODE_LATE_LOADING x86=n
 X86_MSR x86=m
 X86_CPUID x86=m
@@ -96,21 +94,18 @@ X86_INTEL_TSX_MODE_OFF x86=y
 X86_INTEL_TSX_MODE_ON x86=n
 X86_INTEL_TSX_MODE_AUTO x86=n
 X86_SGX all=y
+X86_USER_SHADOW_STACK all=y
 EFI x86=y
 EFI_STUB all=y
 EFI_MIXED all=y
 #- file kernel/Kconfig.hz goes here
-KEXEC x86=y
-CRASH_DUMP x86=n
-KEXEC_JUMP x86=y
 PHYSICAL_START x86=0x1000000
 RELOCATABLE i386=y x86_64=y
 RANDOMIZE_BASE i386=y x86_64=y
 PHYSICAL_ALIGN x86=0x1000000
 RANDOMIZE_MEMORY all=y
+ADDRESS_MASKING all=y
 HOTPLUG_CPU x86=y
-BOOTPARAM_HOTPLUG_CPU0 all=n
-DEBUG_HOTPLUG_CPU0 all=n
 COMPAT_VDSO x86=n
 LEGACY_VSYSCALL_XONLY all=y
 LEGACY_VSYSCALL_NONE all=n
@@ -120,11 +115,13 @@ STRICT_SIGALTSTACK_SIZE all=y
 SPECULATION_MITIGATIONS x86=y
 PAGE_TABLE_ISOLATION all=y
 RETPOLINE x86=y
-RETHUNK x86_64=y
+RETHUNK x86=n x86_64=y
 CPU_UNRET_ENTRY x86_64=y
 CPU_IBPB_ENTRY x86_64=y
 CPU_IBRS_ENTRY x86_64=y
+CPU_SRSO x86_64=y
 SLS x86_64=y
+GDS_FORCE_MITIGATION x86_64=n x86=n
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 APM i386=m
@@ -237,6 +234,7 @@ ACPI_FPDT all=y
 #- *** FILE: drivers/cpufreq/Kconfig.x86 ***
 #-
 X86_PCC_CPUFREQ x86=m x86_64=m
+X86_AMD_PSTATE_DEFAULT_MODE x86_64=3 x86=3
 X86_ACPI_CPUFREQ x86=m
 X86_ACPI_CPUFREQ_CPB all=y
 X86_POWERNOW_K6 i386=m
@@ -254,3 +252,12 @@ X86_LONGHAUL i386=m
 X86_E_POWERSAVER i386=m
 #- shared options
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+BOOTPARAM_HOTPLUG_CPU0 all=n
+DEBUG_HOTPLUG_CPU0 all=n
+KEXEC_JUMP x86=y
+MICROCODE_AMD x86=y
+MICROCODE_INTEL x86=y