kernel: Update to 3.6.6.

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

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 35d8b05c34497e425789aa555fc8588e3eff682c..71624c598ae64dcc97034159a83667509bc33d60 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,13 +30,19 @@ 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_CGROUP_HUGETLB is not set
 CONFIG_PCSPKR_PLATFORM=y
 
 #
@@ -47,11 +52,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 +65,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
@@ -130,6 +130,7 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
@@ -307,6 +308,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 +428,7 @@ CONFIG_I2C_SCMI=m
 #
 # CONFIG_GPIO_IT8761E is not set
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 
 #
 # PCI GPIO expanders:
@@ -463,7 +470,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
@@ -494,7 +501,7 @@ CONFIG_XEN_WDT=m
 CONFIG_MFD_CS5535=m
 
 #
-# Multimedia drivers
+# Media drivers
 #
 CONFIG_IR_ENE=m
 CONFIG_IR_ITE_CIR=m
@@ -503,9 +510,8 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_WINBOND_CIR=m
 
 #
-# Miscelaneous helper chips
+# Webcam and/or TV USB devices
 #
-CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_VIA_CAMERA=m
 
 #
@@ -611,6 +617,7 @@ CONFIG_EDAC=y
 #
 # Reporting subsystems
 #
+# CONFIG_EDAC_LEGACY_SYSFS is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MCE_INJ=m
@@ -637,6 +644,7 @@ CONFIG_PCH_DMA=m
 # DMA Clients
 #
 CONFIG_DCA=m
+# CONFIG_VFIO is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -665,15 +673,8 @@ CONFIG_XEN_ACPI_PROCESSOR=m
 # CONFIG_SLICOSS is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ZRAM is not set
-# CONFIG_ZCACHE is not set
-CONFIG_ZSMALLOC=m
 # CONFIG_ACPI_QUICKSTART is not set
 
-#
-# Speakup console speech
-#
-# CONFIG_INTEL_MEI is not set
-
 #
 # Android
 #
@@ -771,10 +772,9 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # 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
@@ -782,6 +782,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_NX_TEST=m
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
@@ -847,6 +848,8 @@ CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 # Crypto core or helper
 #
 CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Digest