Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86/build changes from Ingo Molnar:
 "defconfig and kconfig cleanups/fixes"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/Kconfig: Clean up Kconfig defaults
  x86/Kconfig: Turn off DEBUG_NX_TEST module in defconfigs
  x86/Kconfig: Turn off CONFIG_BLK_DEV_RAM
  x86/Kconfig: Disable CONFIG_CRC_T10DIF in defconfigs
  x86/Kconfig: Switch to ext4 in defconfigs
  x86/Kconfig: Update defconfigs to current results of "make savedefconfig"

diff --cc arch/x86/Kconfig
index 488ba8da8fef8068c3809d9747b068f1341f346d,3fb871908ab2d481a2716cdee643d21cd69d4c02..57fecc1db94d6f8258ec948a244f60789ce4ac8c
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -100,11 -99,10 +102,12 @@@ config X8
        select KTIME_SCALAR if X86_32
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
 +      select HAVE_RCU_USER_QS if X86_64
 +      select HAVE_IRQ_TIME_ACCOUNTING
  
  config INSTRUCTION_DECODER
-       def_bool (KPROBES || PERF_EVENTS || UPROBES)
+       def_bool y
+       depends on KPROBES || PERF_EVENTS || UPROBES
  
  config OUTPUT_FORMAT
        string
@@@ -751,13 -754,14 +759,14 @@@ config SWIOTL
        def_bool y if X86_64
        ---help---
          Support for software bounce buffers used on x86-64 systems
 -        which don't have a hardware IOMMU (e.g. the current generation
 -        of Intel's x86-64 CPUs). Using this PCI devices which can only
 -        access 32-bits of memory can be used on systems with more than
 -        3 GB of memory. If unsure, say Y.
 +        which don't have a hardware IOMMU. Using this PCI devices
 +        which can only access 32-bits of memory can be used on systems
 +        with more than 3 GB of memory.
 +        If unsure, say Y.
  
  config IOMMU_HELPER
-       def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
+       def_bool y
+       depends on CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU
  
  config MAXSMP
        bool "Enable Maximum number of SMP Processors and NUMA Nodes"