DMA_PERNUMA_CMA replaced by DMA_NUMA_CMA

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

diff --git a/kernel-x86.config b/kernel-x86.config
index ff87a25b51ea52a2c681749dd7ecc3e72b10631c..8593d38a13b49084b8369ff2a18e82eef3306773 100644 (file)
--- 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,13 +94,11 @@ 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
@@ -262,4 +258,6 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #-
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
-X86_USER_SHADOW_STACK all=y
+KEXEC_JUMP x86=y
+MICROCODE_AMD x86=y
+MICROCODE_INTEL x86=y