- disable CONFIG_BPF_PRELOAD on x32

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

diff --git a/kernel-x86.config b/kernel-x86.config
index b6cd894006a0e5a96c1b8ba8a236acfb39eef6e5..987a4c404f0aa988c7aaca9d33b33d78e7b05480 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -28,13 +28,12 @@ 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
 DMI x86=y
 GART_IOMMU x86_64=y
-CALGARY_IOMMU x86_64=y
-CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
 MAXSMP i386=n x86_64=n
 NR_CPUS i386=32 x86_64=512
 SCHED_SMT x86=y
@@ -51,6 +50,7 @@ X86_MCE_INJECT x86=m
 X86_LEGACY_VM86 i386=n
 VM86 i386=y
 X86_VSYSCALL_EMULATION x86=y
+X86_IOPL_IOPERM x86=y
 TOSHIBA i386=m
 I8K x86=m
 X86_REBOOTFIXUPS i386=y
@@ -83,7 +83,6 @@ 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
@@ -137,10 +136,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
@@ -182,7 +183,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 ***
@@ -224,6 +224,8 @@ AMD_IOMMU x86_64=y
 ARCH_HAS_GCOV_PROFILE_ALL x86=y
 ARCH_HAS_PKEYS all=y
 ARCH_USES_HIGH_VMA_FLAGS all=y
+CALGARY_IOMMU x86_64=y
+CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
 COMEDI_AMPLC_DIO200_ISA all=m
 COMEDI_AMPLC_PC236_ISA all=m
 COMEDI_AMPLC_PC263_ISA all=m
@@ -279,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