kernel: Update to 3.5.1.

[ipfire-3.x.git] / kernel / config-x86-generic

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 35d8b05c34497e425789aa555fc8588e3eff682c..f9ad22ff0b23d14a5944641ee216a756999ced77 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -1,8 +1,5 @@
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -19,6 +16,8 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -31,11 +30,16 @@ CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_PCSPKR_PLATFORM=y
@@ -47,11 +51,7 @@ CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_STOP_MACHINE=y
+CONFIG_SECCOMP_FILTER=y
 
 #
 # IO Schedulers
@@ -64,7 +64,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 # Processor type and features
 #
 CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_EXTENDED_PLATFORM=y
@@ -307,6 +306,11 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_VMWARE_BALLOON=m
 
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_INTEL_MEI is not set
+
 #
 # SCSI Transports
 #
@@ -422,6 +426,7 @@ CONFIG_I2C_SCMI=m
 #
 # CONFIG_GPIO_IT8761E is not set
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 
 #
 # PCI GPIO expanders:
@@ -463,7 +468,7 @@ CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 # CONFIG_WAFER_WDT is not set
-CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 CONFIG_IT8712F_WDT=m
@@ -669,11 +674,6 @@ CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_ZSMALLOC=m
 # CONFIG_ACPI_QUICKSTART is not set
 
-#
-# Speakup console speech
-#
-# CONFIG_INTEL_MEI is not set
-
 #
 # Android
 #
@@ -773,8 +773,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_FTRACE_SYSCALLS=y
+# CONFIG_UPROBE_EVENT is not set
 # CONFIG_MMIOTRACE is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
@@ -877,6 +877,8 @@ CONFIG_VHOST_NET=m
 #
 # Library routines
 #
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ALLOCATOR=y