summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-05-17 09:03:07 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-05-17 11:14:02 -0400
commit6116861edf2be2615467c0f189153f95badf7e58 (patch)
tree4cde55ba426e107151683f8b4356c2a1d9d97b84 /config-x86-32-generic
parent59915d41e79894c3ddd27a6a83e74b3991b23451 (diff)
downloadkernel-6116861edf2be2615467c0f189153f95badf7e58.tar.gz
kernel-6116861edf2be2615467c0f189153f95badf7e58.tar.xz
kernel-6116861edf2be2615467c0f189153f95badf7e58.zip
Linux v4.6
- Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) - CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410)
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r--config-x86-32-generic11
1 files changed, 2 insertions, 9 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 865fb9004..ddc9f3047 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -40,6 +40,7 @@ CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
CONFIG_HIGHMEM=y
CONFIG_HIGHPTE=y
+CONFIG_ZONE_DMA=y
# CONFIG_MATH_EMULATION is not set
@@ -81,7 +82,6 @@ CONFIG_X86_LONGRUN=y
# e_powersaver is dangerous
# CONFIG_X86_E_POWERSAVER is not set
-CONFIG_X86_HT=y
# CONFIG_4KSTACKS is not set
@@ -123,7 +123,6 @@ CONFIG_CRYPTO_TWOFISH_586=m
CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
CONFIG_MTD_NAND_CAFE=m
@@ -184,13 +183,6 @@ CONFIG_MFD_CS5535=m
# I2O enabled only for 32-bit x86, disabled for PAE kernel
CONFIG_I2O=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_I2O_CONFIG=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
CONFIG_INPUT_PWM_BEEPER=m
CONFIG_BACKLIGHT_PWM=m
@@ -219,4 +211,5 @@ CONFIG_OF=y
# CONFIG_COMMON_CLK_SI570 is not set
# CONFIG_COMMON_CLK_QCOM is not set
# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
# CONFIG_KEYBOARD_BCM is not set