sip: update to 4.18.1

[people/ms/ipfire-3.x.git] / kernel / config-i686-default

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index ee28ec1156eedc13ffb5caa3ec9fc18c2b131627..47d5994c268b20b2c6701d75477a7c4a975506b2 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -2,10 +2,9 @@
 CONFIG_X86_32=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_ZONE_DMA32 is not set
-# CONFIG_AUDIT_ARCH is not set
 CONFIG_X86_32_SMP=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_PGTABLE_LEVELS=3
 
 #
 # Timers subsystem
@@ -18,11 +17,6 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_TICK_CPU_ACCOUNTING is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 
-#
-# RCU Subsystem
-#
-CONFIG_RCU_FANOUT=32
-
 #
 # Kernel Performance Events And Counters
 #
@@ -71,7 +65,6 @@ CONFIG_M686=y
 # CONFIG_MVIAC7 is not set
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
@@ -79,7 +72,7 @@ CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 # CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_VM86=y
+# CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_TOSHIBA=m
 # CONFIG_X86_REBOOTFIXUPS is not set
 # CONFIG_NOHIGHMEM is not set
@@ -100,7 +93,6 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HIGHPTE=y
-# CONFIG_MATH_EMULATION is not set
 CONFIG_PHYSICAL_START=0x400000
 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -144,7 +136,6 @@ CONFIG_X86_LONGRUN=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 # CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
 
 #
 # PCI host controller drivers
@@ -162,6 +153,11 @@ CONFIG_PCI_BIOS=y
 # CONFIG_HOTPLUG_PCI_IBM is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
+#
+# Executable file formats / Emulations
+#
+# CONFIG_BINFMT_AOUT is not set
+
 #
 # Misc devices
 #
@@ -195,6 +191,7 @@ CONFIG_PCH_GBE=m
 #
 # Input Device Drivers
 #
+# CONFIG_KEYBOARD_STMPE is not set
 # CONFIG_INPUT_WISTRON_BTNS is not set
 
 #
@@ -221,6 +218,7 @@ CONFIG_I2C_SIS630=m
 #
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 # CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_PXA is not set
 
 #
 # Other I2C/SMBus bus drivers
@@ -233,22 +231,41 @@ CONFIG_SCx200_ACB=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 
 #
-# PCI GPIO expanders:
+# MFD GPIO expanders
+#
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_TC3589X is not set
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_PCH=m
+
+#
+# USB GPIO expanders
+#
+# CONFIG_POWER_RESET_AS3722 is not set
+
+#
+# ACPI drivers
 #
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_PCH is not set
+CONFIG_INTEL_QUARK_DTS_THERMAL=m
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_GEODE_WDT=m
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
 
 #
 # Multifunction device drivers
 #
 CONFIG_MFD_CS5535=m
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
 # CONFIG_MFD_TIMBERDALE is not set
 
 #
@@ -276,6 +293,7 @@ CONFIG_VIDEO_OV7670=m
 #
 # CONFIG_FB_I810 is not set
 # CONFIG_FB_GEODE is not set
+# CONFIG_BACKLIGHT_OT200 is not set
 
 #
 # Console display driver support
@@ -305,7 +323,7 @@ CONFIG_LEDS_OT200=m
 CONFIG_PCH_DMA=m
 
 #
-# Android
+# Microsoft Hyper-V guest support
 #
 CONFIG_TC1100_WMI=m
 CONFIG_INTEL_IMR=y
@@ -326,24 +344,7 @@ CONFIG_CLKSRC_I8253=y
 # CONFIG_DEBUG_IMR_SELFTEST is not set
 
 #
-# Grsecurity
-#
-CONFIG_ARCH_TRACK_EXEC_LIMIT=y
-
-#
-# Non-executable pages
-#
-CONFIG_PAX_SEGMEXEC=y
-CONFIG_PAX_KERNEXEC_PLUGIN_METHOD=""
-CONFIG_PAX_KERNEXEC_MODULE_TEXT=8
-
-#
-# Memory Protections
-#
-CONFIG_GRKERNSEC_VM86=y
-
-#
-# Logging Options
+# Security options
 #
 # CONFIG_INTEL_TXT is not set
 
@@ -356,7 +357,7 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES_586=y
-# CONFIG_CRYPTO_SALSA20_586 is not set
+CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
 
@@ -364,6 +365,10 @@ CONFIG_CRYPTO_TWOFISH_586=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_DEV_GEODE=m
+
+#
+# Certificates for signature checking
+#
 # CONFIG_LGUEST is not set
 
 #