kernel: Update to 3.14.2.

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

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index c273ee1d07868dd8e74140f9de82e9fcba512c04..9f81e2121949fc15b5f742bfb41adb204d5ec377 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -1,19 +1,42 @@
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
 # 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"
+
+#
+# IRQ subsystem
+#
 CONFIG_KTIME_SCALAR=y
 
+#
+# Timers subsystem
+#
+CONFIG_NO_HZ_IDLE=y
+
+#
+# CPU/Task time and stats accounting
+#
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
+
 #
 # RCU Subsystem
 #
 CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_NOCB_CPU_NONE is not set
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -24,16 +47,17 @@ CONFIG_LBDAF=y
 # Processor type and features
 #
 CONFIG_X86_BIGSMP=y
-# CONFIG_X86_WANT_INTEL_MID is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_32_NON_STANDARD=y
 # CONFIG_X86_NUMAQ is not set
+# CONFIG_STA2X11 is not set
 # CONFIG_X86_SUMMIT is not set
 # CONFIG_X86_ES7000 is not set
 CONFIG_X86_32_IRIS=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 # CONFIG_LGUEST_GUEST is not set
-# CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
@@ -56,11 +80,7 @@ CONFIG_M686=y
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
@@ -76,6 +96,9 @@ CONFIG_TOSHIBA=m
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
@@ -89,15 +112,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x400000
-CONFIG_X86_NEED_RELOCS=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
 CONFIG_PHYSICAL_ALIGN=0x400000
 
 #
 # Power management and ACPI options
 #
-CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_X86_APM_BOOT=y
 CONFIG_APM=y
 # CONFIG_APM_IGNORE_USER_SUSPEND is not set
@@ -135,10 +156,15 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
+
+#
+# PCI host controller drivers
+#
 # CONFIG_ISA is not set
-# CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
 
 #
 # PC-card bridges
@@ -194,11 +220,6 @@ CONFIG_I2C_SIS630=m
 #
 CONFIG_SCx200_ACB=m
 
-#
-# PCI GPIO expanders:
-#
-# CONFIG_GPIO_LANGWELL is not set
-
 #
 # Watchdog Device Drivers
 #
@@ -206,14 +227,14 @@ CONFIG_GEODE_WDT=m
 # CONFIG_SBC7240_WDT is not set
 
 #
-# Customize TV tuners
+# Media digital TV PCI Adapters
 #
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEO_CAFE_CCIC=m
 
 #
-# Miscelaneous helper chips
+# Camera sensor devices
 #
-CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_OV7670=m
 
 #
 # Graphics support
@@ -229,6 +250,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_I810 is not set
+# CONFIG_FB_GEODE is not set
 
 #
 # Console display driver support
@@ -236,7 +258,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_SND_SIS7019 is not set
 
 #
-# Reporting subsystems
+# iptables trigger is under Netfilter config (LED target)
 #
 # CONFIG_EDAC_AMD76X is not set
 # CONFIG_EDAC_E7XXX is not set
@@ -255,19 +277,12 @@ CONFIG_TC1100_WMI=m
 CONFIG_CLKSRC_I8253=y
 
 #
-# Kernel hacking
+# Memory Debugging
 #
 # CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_DOUBLEFAULT=y
-
-#
-# Memory Protections
-#
-CONFIG_GRKERNSEC_VM86=y
 
 #
-# PaX
+# Grsecurity
 #
 CONFIG_ARCH_TRACK_EXEC_LIMIT=y
 
@@ -277,10 +292,20 @@ CONFIG_ARCH_TRACK_EXEC_LIMIT=y
 CONFIG_PAX_SEGMEXEC=y
 
 #
-# Miscellaneous hardening features
+# Memory Protections
+#
+CONFIG_GRKERNSEC_VM86=y
+
+#
+# Logging Options
 #
 # CONFIG_INTEL_TXT is not set
 
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
 #
 # Ciphers
 #