- up to 5.11.0

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

diff --git a/kernel-x86.config b/kernel-x86.config
index 69341566acd81c19eeb58c7cb5bc4c756356b778..5eb51b1eb79e459b27b66d10134580628ad4d0a7 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -28,6 +28,7 @@ PARAVIRT_DEBUG x86=n
 PARAVIRT_SPINLOCKS x86=n
 #- file arch/x86/xen/Kconfig goes here
 KVM_GUEST x86=y
+PVH x86=y
 PARAVIRT_TIME_ACCOUNTING x86=y
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
@@ -82,14 +83,12 @@ MTRR_SANITIZER x86=y
 MTRR_SANITIZER_ENABLE_DEFAULT x86=0
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
-X86_INTEL_MPX x86=y
 X86_INTEL_MEMORY_PROTECTION_KEYS all=y
 X86_INTEL_TSX_MODE_OFF x86=y
 X86_INTEL_TSX_MODE_ON x86=n
 X86_INTEL_TSX_MODE_AUTO x86=n
 EFI x86=y
 EFI_STUB all=y
-SECCOMP x86=y
 #- file kernel/Kconfig.hz goes here
 KEXEC x86=y
 CRASH_DUMP x86=n
@@ -136,10 +135,12 @@ IA32_AOUT x86_64=y
 X86_X32 x86_64=y
 #- file drivers/firmware/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
+#- file arch/x86/Kconfig.assembler goes here
 
 #-
 #- *** FILE: arch/x86/Kconfig.cpu ***
 #-
+M486SX x86=n
 M486 i386=n i486=y
 M586 i386=n i586=y
 M586TSC i386=n
@@ -181,7 +182,6 @@ KVM x86=m
 KVM_INTEL x86=m
 KVM_AMD x86=m
 KVM_MMU_AUDIT x86=y
-#- file drivers/vhost/Kconfig goes here
 
 #-
 #- *** FILE: arch/x86/xen/Kconfig ***
@@ -271,6 +271,7 @@ PCIEASPM_PERFORMANCE all=n
 PCIEASPM_POWERSAVE all=n
 PCIEASPM_POWER_SUPERSAVE all=n
 RAPIDIO all=y
+SECCOMP x86=y
 SND_X86 all=y
 SPARSE_IRQ i386=y x86_64=y
 STA2X11_VIP all=m
@@ -280,6 +281,7 @@ VIDEO_IVTV_DEPRECATED_IOCTLS all=n
 VMD all=m
 WW_MUTEX_SELFTEST all=m
 X86_DECODER_SELFTEST x86=n
+X86_INTEL_MPX x86=y
 #* do we care ?
 X86_PPRO_FENCE i386=y pentium3= pentium4= athlon=
 X86_PTDUMP x86=n