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

Pull x86 cleanups from Ingo Molnar:
 "A handful of cleanups: dma-ops cleanups, missing boot time kcalloc()
  check, a Sparse fix and use struct_size() to simplify a vzalloc()
  call"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pci: Clean up usage of X86_DEV_DMA_OPS
  x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol
  x86/kexec/crash: Use struct_size() in vzalloc()
  x86/mm/tlb: Define LOADED_MM_SWITCHING with pointer-sized number
  x86/platform/uv: Fix missing checks of kcalloc() return values

diff --combined arch/x86/Kconfig
index 90e2640ade75416c9b328c970bf63754f0ccc951,60f6459344bc21b3babbfea91ce378ee6eaf70fe..7e59efc70b9125086414c38e1cbc3bc0de489ddb
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -28,7 -28,6 +28,6 @@@ config X86_6
        select MODULES_USE_ELF_RELA
        select NEED_DMA_MAP_STATE
        select SWIOTLB
-       select X86_DEV_DMA_OPS
        select ARCH_HAS_SYSCALL_WRAPPER
  
  #
@@@ -74,7 -73,6 +73,7 @@@ config X8
        select ARCH_MIGHT_HAVE_ACPI_PDC         if ACPI
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
 +      select ARCH_STACKWALK
        select ARCH_SUPPORTS_ACPI
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_SUPPORTS_NUMA_BALANCING     if X86_64
@@@ -184,6 -182,7 +183,6 @@@
        select HAVE_PERF_REGS
        select HAVE_PERF_USER_STACK_DUMP
        select HAVE_RCU_TABLE_FREE              if PARAVIRT
 -      select HAVE_RCU_TABLE_INVALIDATE        if HAVE_RCU_TABLE_FREE
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_RELIABLE_STACKTRACE         if X86_64 && (UNWINDER_FRAME_POINTER || UNWINDER_ORC) && STACK_VALIDATION
        select HAVE_FUNCTION_ARG_ACCESS_API
@@@ -268,6 -267,9 +267,6 @@@ config ARCH_MAY_HAVE_PC_FD
        def_bool y
        depends on ISA_DMA_API
  
 -config RWSEM_XCHGADD_ALGORITHM
 -      def_bool y
 -
  config GENERIC_CALIBRATE_DELAY
        def_bool y
  
@@@ -700,8 -702,6 +699,6 @@@ config STA2X1
        bool "STA2X11 Companion Chip Support"
        depends on X86_32_NON_STANDARD && PCI
        select ARCH_HAS_PHYS_TO_DMA
-       select X86_DEV_DMA_OPS
-       select X86_DMA_REMAP
        select SWIOTLB
        select MFD_STA2X11
        select GPIOLIB
@@@ -780,6 -780,14 +777,6 @@@ config PARAVIRT_SPINLOCK
  
          If you are unsure how to answer this question, answer Y.
  
 -config QUEUED_LOCK_STAT
 -      bool "Paravirt queued spinlock statistics"
 -      depends on PARAVIRT_SPINLOCKS && DEBUG_FS
 -      ---help---
 -        Enable the collection of statistical data on the slowpath
 -        behavior of paravirtualized queued spinlocks and report
 -        them on debugfs.
 -
  source "arch/x86/xen/Kconfig"
  
  config KVM_GUEST
@@@ -1488,7 -1496,7 +1485,7 @@@ config X86_CPA_STATISTIC
        depends on DEBUG_FS
        ---help---
          Expose statistics about the Change Page Attribute mechanims, which
 -        helps to determine the effectivness of preserving large and huge
 +        helps to determine the effectiveness of preserving large and huge
          page mappings when mapping protections are changed.
  
  config ARCH_HAS_MEM_ENCRYPT
@@@ -2206,8 -2214,14 +2203,8 @@@ config RANDOMIZE_MEMORY_PHYSICAL_PADDIN
           If unsure, leave at the default value.
  
  config HOTPLUG_CPU
 -      bool "Support for hot-pluggable CPUs"
 +      def_bool y
        depends on SMP
 -      ---help---
 -        Say Y here to allow turning CPUs off and on. CPUs can be
 -        controlled through /sys/devices/system/cpu.
 -        ( Note: power management support will enable this option
 -          automatically on SMP systems. )
 -        Say N if you want to disable CPU hotplug.
  
  config BOOTPARAM_HOTPLUG_CPU0
        bool "Set default setting of cpu0_hotpluggable"
@@@ -2867,11 -2881,6 +2864,6 @@@ config HAVE_ATOMIC_IOMA
  
  config X86_DEV_DMA_OPS
        bool
-       depends on X86_64 || STA2X11
- 
- config X86_DMA_REMAP
-       bool
-       depends on STA2X11
  
  config HAVE_GENERIC_GUP
        def_bool y