kernel: Update to 3.11.6.

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

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 958ca93f5b82047d47328194ca42d1d6328e0895..72712fd84bb4677f87b118fb624c696625779dfd 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -10,6 +10,8 @@ CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_HT=y
@@ -123,8 +125,8 @@ CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MICROCODE_INTEL_LIB=y
-CONFIG_MICROCODE_INTEL_EARLY=y
-CONFIG_MICROCODE_EARLY=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
 CONFIG_X86_CPUID=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -261,23 +263,19 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-CONFIG_PCIE_ECRC=y
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
 # CONFIG_PCIEASPM_DEFAULT is not set
 CONFIG_PCIEASPM_POWERSAVE=y
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_HT_IRQ=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 
@@ -297,6 +295,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Bluetooth device drivers
@@ -382,6 +381,7 @@ CONFIG_ATM_HE=m
 #
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -393,7 +393,9 @@ CONFIG_IXGBEVF=m
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
 CONFIG_MYRI10GE_DCA=y
+CONFIG_PCH_GBE=m
 CONFIG_ATP=m
 CONFIG_SUNGEM=m
 # CONFIG_NET_SB1000 is not set
@@ -479,6 +481,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_GPIO_ACPI=y
 
 #
@@ -516,6 +519,7 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_CPU_THERMAL=y
 CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
 
 #
 # Watchdog Device Drivers
@@ -583,6 +587,7 @@ CONFIG_VIDEO_MEYE=m
 #
 # Media digital TV PCI Adapters
 #
+CONFIG_SOC_CAMERA_SCALE_CROP=m
 CONFIG_VIDEO_SH_MOBILE_CSI2=m
 CONFIG_VIDEO_SH_MOBILE_CEU=m
 
@@ -614,6 +619,9 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_BACKLIGHT=y
 
 #
@@ -626,7 +634,6 @@ CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_VIA is not set
-# CONFIG_FB_GEODE is not set
 CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
@@ -644,6 +651,7 @@ CONFIG_SND_ALS4000=m
 CONFIG_SND_ALI5451=m
 CONFIG_SND_ASIHPI=m
 CONFIG_SND_CS5530=m
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_US122L=m
 # CONFIG_SND_SOC is not set
@@ -687,7 +695,6 @@ CONFIG_EDAC_I7300=m
 # CONFIG_INTEL_MID_DMAC is not set
 CONFIG_INTEL_IOATDMA=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ACPI=y
 
@@ -782,6 +789,8 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 # CONFIG_APPLE_GMUX is not set
+# CONFIG_INTEL_RST is not set
+CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_COMMON_CLK=y
 
@@ -789,6 +798,7 @@ CONFIG_COMMON_CLK=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
+CONFIG_COMMON_CLK_SI5351=m
 
 #
 # Hardware Spinlock drivers
@@ -803,7 +813,7 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
 #
-# Magnetometer sensors
+# Pressure Sensors
 #
 # CONFIG_PWM is not set
 
@@ -840,20 +850,29 @@ CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_EFIVAR_FS=m
 
 #
-# Kernel hacking
+# Compile-time checks and compiler options
+#
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
+
+#
+# Debug Lockups and Hangs
 #
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
 
 #
 # RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -861,11 +880,16 @@ CONFIG_FTRACE_SYSCALLS=y
 # CONFIG_UPROBE_EVENT is not set
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_MMIOTRACE is not set
+
+#
+# Runtime Testing
+#
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_NX_TEST=m
+CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
@@ -881,6 +905,7 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Non-executable pages
@@ -967,6 +992,7 @@ CONFIG_KVM_DEVICE_ASSIGNMENT=y
 #
 # Library routines
 #
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ALLOCATOR=y