Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new...

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/Kconfig
index c226c2bda7f3b248e64b325ca2f6a22e62e1b2c2,b7d31ca5518744983c77bc8339f30756621dfea0..78a3f674c3ebe363b1c808a80b81f2ace50ef689
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -17,6 -17,7 +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
@@@ -84,6 -85,7 +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
@@@ -233,10 -235,12 +235,10 @@@ config ARCH_WANT_GENERAL_HUGETL
        def_bool y
  
  config ZONE_DMA32
 -      bool
 -      default X86_64
 +      def_bool y if X86_64
  
  config AUDIT_ARCH
 -      bool
 -      default X86_64
 +      def_bool y if X86_64
  
  config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
@@@ -484,6 -488,23 +486,23 @@@ 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
+       select COMMON_CLK
+       ---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
@@@ -495,6 -516,17 +514,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
@@@ -859,8 -891,7 +889,8 @@@ config UP_LATE_INI
         depends on !SMP && X86_LOCAL_APIC
  
  config X86_UP_APIC
 -      bool "Local APIC support on uniprocessors"
 +      bool "Local APIC support on uniprocessors" if !PCI_MSI
 +      default PCI_MSI
        depends on X86_32 && !SMP && !X86_32_NON_STANDARD
        ---help---
          A local APIC (Advanced Programmable Interrupt Controller) is an
@@@ -872,6 -903,10 +902,6 @@@
          performance counters), and the NMI watchdog which detects hard
          lockups.
  
 -config X86_UP_APIC_MSI
 -      def_bool y
 -      select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI
 -
  config X86_UP_IOAPIC
        bool "IO-APIC support on uniprocessors"
        depends on X86_UP_APIC
@@@ -890,8 -925,8 +920,8 @@@ config X86_LOCAL_API
        select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
  
  config X86_IO_APIC
 -      def_bool X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC
 -      depends on X86_LOCAL_APIC
 +      def_bool y
 +      depends on X86_LOCAL_APIC || X86_UP_IOAPIC
        select IRQ_DOMAIN
  
  config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
@@@ -1110,10 -1145,10 +1140,10 @@@ config MICROCODE_OLD_INTERFAC
        depends on MICROCODE
  
  config MICROCODE_INTEL_EARLY
 -      def_bool n
 +      bool
  
  config MICROCODE_AMD_EARLY
 -      def_bool n
 +      bool
  
  config MICROCODE_EARLY
        bool "Early load microcode"
@@@ -2012,6 -2047,8 +2042,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