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

[linux-drm-fsl-dcu.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1f97c7f0d049eb93f8d59abaa2de281059913a19..c2fb8a87dccb2990a794bb8960bfdad85eb9a390 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -17,6 +17,7 @@ config X86_64
        depends on 64BIT
        select X86_DEV_DMA_OPS
        select ARCH_USE_CMPXCHG_LOCKREF
        depends on 64BIT
        select X86_DEV_DMA_OPS
        select ARCH_USE_CMPXCHG_LOCKREF

+       select HAVE_LIVEPATCH

 
 ### Arch settings
 config X86
 
 ### Arch settings
 config X86


@@ -84,6 +85,7 @@ config X86
        select HAVE_CMPXCHG_LOCAL
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_ARCH_KMEMCHECK
        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
        select HAVE_USER_RETURN_NOTIFIER
        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select HAVE_ARCH_JUMP_LABEL


@@ -513,6 +515,17 @@ config X86_INTEL_LPSS
          things like clock tree (common clock framework) and pincontrol
          which are needed by the LPSS peripheral drivers.
 
          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
 config IOSF_MBI
        tristate "Intel SoC IOSF Sideband support for SoC platforms"
        depends on PCI


@@ -2033,6 +2046,8 @@ config CMDLINE_OVERRIDE
          This is used to work around broken boot loaders.  This should
          be set to 'N' under normal conditions.
 
          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
 endmenu
 
 config ARCH_ENABLE_MEMORY_HOTPLUG