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

Pull Intel Quark SoC support from Ingo Molnar:
 "This adds support for Intel Quark X1000 SoC boards, used in the low
  power 32-bit x86 Intel Galileo microcontroller board intended for the
  Arduino space.

  There's been some preparatory core x86 patches for Quark CPU quirks
  merged already, but this rounds it all up and adds Kconfig enablement.
  It's a clean hardware enablement addition tree at this point"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel/quark: Fix simple_return.cocci warnings
  x86/intel/quark: Fix ptr_ret.cocci warnings
  x86/intel/quark: Add Intel Quark platform support
  x86/intel/quark: Add Isolated Memory Regions for Quark X1000

diff --combined arch/x86/Kconfig
index eb1cf89,1f97c7f..c2fb8a8
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -17,7 -17,6 +17,7 @@@ config X86_6
        depends on 64BIT
        select X86_DEV_DMA_OPS
        select ARCH_USE_CMPXCHG_LOCKREF
 +      select HAVE_LIVEPATCH
  
  ### Arch settings
  config X86
@@@ -85,7 -84,6 +85,7 @@@
        select HAVE_CMPXCHG_LOCAL
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_ARCH_KMEMCHECK
 +      select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP
        select HAVE_USER_RETURN_NOTIFIER
        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select HAVE_ARCH_JUMP_LABEL
@@@ -488,6 -486,22 +488,22 @@@ config X86_INTEL_MI
          Intel MID platforms are based on an Intel processor and chipset which
          consume less power than most of the x86 derivatives.
  
+ config X86_INTEL_QUARK
+       bool "Intel Quark platform support"
+       depends on X86_32
+       depends on X86_EXTENDED_PLATFORM
+       depends on X86_PLATFORM_DEVICES
+       depends on X86_TSC
+       depends on PCI
+       depends on PCI_GOANY
+       depends on X86_IO_APIC
+       select IOSF_MBI
+       select INTEL_IMR
+       ---help---
+         Select to include support for Quark X1000 SoC.
+         Say Y here if you have a Quark based system such as the Arduino
+         compatible Intel Galileo.
+ 
  config X86_INTEL_LPSS
        bool "Intel Low Power Subsystem Support"
        depends on ACPI
@@@ -499,17 -513,6 +515,17 @@@
          things like clock tree (common clock framework) and pincontrol
          which are needed by the LPSS peripheral drivers.
  
 +config X86_AMD_PLATFORM_DEVICE
 +      bool "AMD ACPI2Platform devices support"
 +      depends on ACPI
 +      select COMMON_CLK
 +      select PINCTRL
 +      ---help---
 +        Select to interpret AMD specific ACPI device to platform device
 +        such as I2C, UART, GPIO found on AMD Carrizo and later chipsets.
 +        I2C and UART depend on COMMON_CLK to set clock. GPIO driver is
 +        implemented under PINCTRL subsystem.
 +
  config IOSF_MBI
        tristate "Intel SoC IOSF Sideband support for SoC platforms"
        depends on PCI
@@@ -2030,8 -2033,6 +2046,8 @@@ config CMDLINE_OVERRID
          This is used to work around broken boot loaders.  This should
          be set to 'N' under normal conditions.
  
 +source "kernel/livepatch/Kconfig"
 +
  endmenu
  
  config ARCH_ENABLE_MEMORY_HOTPLUG