Merge tag 'nfs-rdma-4.5-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma

[linux-beck.git] / arch / tile / Kconfig

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 8ec7a4599c085dd0d05f7ad819c11d4659223c51..de4a4fff93237a1a9d14c6520f905a67c8ef7aad 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -5,7 +5,6 @@ config TILE
        def_bool y
        select HAVE_PERF_EVENTS
        select USE_PMC if PERF_EVENTS
-       select HAVE_DMA_ATTRS
        select HAVE_DMA_API_DEBUG
        select HAVE_KVM if !TILEGX
        select GENERIC_FIND_FIRST_BIT
@@ -19,6 +18,7 @@ config TILE
        select VIRT_TO_BUS
        select SYS_HYPERVISOR
        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+       select ARCH_HAS_DEVMEM_IS_ALLOWED
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA
@@ -116,9 +116,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
 config TRACE_IRQFLAGS_SUPPORT
        def_bool y
 
-config STRICT_DEVMEM
-       def_bool y
-
 # SMP is required for Tilera Linux.
 config SMP
        def_bool y
@@ -143,6 +140,7 @@ config TILEGX
        select HAVE_KRETPROBES
        select HAVE_ARCH_KGDB
        select ARCH_SUPPORTS_ATOMIC_RMW
+       select HAVE_ARCH_JUMP_LABEL
 
 config TILEPRO
        def_bool !TILEGX