kernel: Update to version 4.2

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

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 26fe28e2901f771457dcb8dacee06edc8ce76425..c448f571883151ca984136b66052756f1e58a357 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -12,7 +12,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_X86_HT=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 
@@ -29,10 +28,9 @@ CONFIG_KERNEL_XZ=y
 #
 # IRQ subsystem
 #
-CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
@@ -42,7 +40,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 #
 # RCU Subsystem
 #
-CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_RCU_NOCB_CPU_NONE is not set
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -55,14 +52,17 @@ CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # IO Schedulers
 #
 CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_ARCH_USE_QUEUE_RWLOCK=y
-CONFIG_QUEUE_RWLOCK=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
 
 #
 # Processor type and features
@@ -127,7 +127,6 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
@@ -136,6 +135,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -178,6 +178,7 @@ CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
@@ -202,6 +203,7 @@ CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
@@ -254,6 +256,7 @@ CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_ATS=y
@@ -306,9 +309,7 @@ CONFIG_RFKILL_GPIO=m
 #
 # Generic Driver Options
 #
-CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 # CONFIG_DMA_CMA is not set
 
@@ -362,7 +363,7 @@ CONFIG_INTEL_MEI_TXE=m
 CONFIG_VMWARE_VMCI=m
 
 #
-# Intel MIC Card Driver
+# SCIF Driver
 #
 # CONFIG_IDE is not set
 
@@ -393,6 +394,11 @@ CONFIG_SCSI_IMM=m
 CONFIG_ATA_ACPI=y
 # CONFIG_SATA_ZPODD is not set
 
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_OF_PLATFORM=m
+
 #
 # Generic fallback / legacy drivers
 #
@@ -429,6 +435,7 @@ CONFIG_ATM_SOLOS=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
 # Distributed Switch Architecture drivers
@@ -493,6 +500,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 CONFIG_KEYBOARD_ADP5520=m
 CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_CAP11XX=m
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_VMMOUSE=y
 CONFIG_INPUT_PCSPKR=m
@@ -533,7 +541,9 @@ CONFIG_SERIAL_8250_FINTEK=m
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
@@ -559,6 +569,7 @@ CONFIG_ACPI_I2C_OPREGION=y
 #
 # Multiplexer I2C Chip support
 #
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 CONFIG_I2C_MUX_PINCTRL=m
 
 #
@@ -610,29 +621,33 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_SINGLE=m
+CONFIG_PINCTRL_PALMAS=y
 # CONFIG_PINCTRL_BAYTRAIL is not set
 CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIO_ACPI=y
-CONFIG_GPIO_GENERIC=m
 
 #
 # Memory mapped GPIO drivers
 #
 CONFIG_GPIO_DWAPB=m
 # CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
+CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_LYNXPOINT is not set
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_XILINX=m
 
 #
 # PCI GPIO expanders
 #
 # CONFIG_GPIO_INTEL_MID is not set
+CONFIG_GPIO_SODAVILLE=y
 
 #
 # USB GPIO expanders
@@ -662,6 +677,7 @@ CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_DELL_SMM=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_I5500=m
 CONFIG_SENSORS_CORETEMP=m
@@ -674,6 +690,7 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
@@ -721,10 +738,15 @@ CONFIG_WDTPCI=m
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_MFD_RTSX_PCI=m
 # CONFIG_ABX500_CORE is not set
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
 CONFIG_MFD_VX855=m
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
@@ -890,22 +912,10 @@ CONFIG_AGP_VIA=y
 CONFIG_INTEL_GTT=y
 CONFIG_VGA_SWITCHEROO=y
 
-#
-# Direct Rendering Manager
-#
-CONFIG_DRM_MIPI_DSI=y
-
 #
 # I2C encoder or helper chips
 #
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_USERPTR is not set
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
@@ -916,11 +926,6 @@ CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 
-#
-# Frame buffer Devices
-#
-CONFIG_FB_BACKLIGHT=y
-
 #
 # Frame buffer hardware drivers
 #
@@ -991,6 +996,7 @@ CONFIG_MEMSTICK_REALTEK_PCI=m
 #
 # LED drivers
 #
+CONFIG_LEDS_AAT1290=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_DELL_NETBOOKS=m
@@ -998,6 +1004,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC=y
 # CONFIG_EDAC_LEGACY_SYSFS is not set
 # CONFIG_EDAC_DEBUG is not set
@@ -1041,7 +1048,6 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_MF624=m
-# CONFIG_VFIO is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -1053,14 +1059,6 @@ CONFIG_UIO_MF624=m
 #
 # Android
 #
-# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -1070,6 +1068,7 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_SMO8800=m
+# CONFIG_DELL_RBTN is not set
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 # CONFIG_FUJITSU_TABLET is not set
@@ -1113,6 +1112,7 @@ CONFIG_SAMSUNG_Q10=m
 # CONFIG_INTEL_RST is not set
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
+CONFIG_INTEL_PMC_IPC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
@@ -1121,6 +1121,7 @@ CONFIG_CHROMEOS_LAPTOP=m
 # Common Clock Framework
 #
 CONFIG_COMMON_CLK_WM831X=m
+CONFIG_COMMON_CLK_MAX77686=m
 
 #
 # Clock Source drivers
@@ -1130,7 +1131,6 @@ CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
 # CONFIG_SH_TIMER_TMU is not set
 CONFIG_PCC=y
-CONFIG_IOMMU_API=y
 
 #
 # Generic IOMMU Pagetable Support
@@ -1141,16 +1141,25 @@ CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
+#
+# SOC (System On Chip) specific Drivers
+#
+# CONFIG_SUNXI_SRAM is not set
+
 #
 # Analog to digital converters
 #
 CONFIG_LP8788_ADC=m
 CONFIG_TWL6030_GPADC=m
 
+#
+# Light sensors
+#
+# CONFIG_ACPI_ALS is not set
+
 #
 # Temperature sensors
 #
-# CONFIG_NTB is not set
 # CONFIG_PWM is not set
 
 #
@@ -1160,6 +1169,15 @@ CONFIG_TWL6030_GPADC=m
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
 # CONFIG_PHY_EXYNOS5250_USB2 is not set
 
+#
+# Android
+#
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+
 #
 # Firmware Drivers
 #
@@ -1179,6 +1197,7 @@ CONFIG_ISCSI_IBFT=m
 # EFI (Extensible Firmware Interface) Support
 #
 CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
@@ -1256,8 +1275,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
 CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 # CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+# CONFIG_X86_DEBUG_FPU is not set
+# CONFIG_PUNIT_ATOM_DEBUG is not set
 
 #
 # Security options
@@ -1316,6 +1338,6 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-CONFIG_INTERVAL_TREE=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_UCS2_STRING=y
+CONFIG_ARCH_HAS_PMEM_API=y