Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / tile / Kconfig

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 0e53439..5b6a40d 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -22,6 +22,9 @@ config TILE
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
        select MODULES_USE_ELF_RELA
+       select HAVE_ARCH_TRACEHOOK
+       select HAVE_SYSCALL_TRACEPOINTS
+       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 
 # FIXME: investigate whether we need/want these options.
 #      select HAVE_IOREMAP_PROT
@@ -40,9 +43,6 @@ config MMU
 config GENERIC_CSUM
        def_bool y
 
-config SEMAPHORE_SLEEPERS
-       def_bool y
-
 config HAVE_ARCH_ALLOC_REMAP
        def_bool y
 
@@ -67,12 +67,6 @@ config HUGETLB_SUPER_PAGES
 config RWSEM_GENERIC_SPINLOCK
        def_bool y
 
-# We have a very flat architecture from a migration point of view,
-# so save boot time by presetting this (particularly useful on tile-sim).
-config DEFAULT_MIGRATION_COST
-       int
-       default "10000000"
-
 # We only support gcc 4.4 and above, so this should work.
 config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
@@ -413,11 +407,6 @@ endmenu
 
 menu "Executable file formats"
 
-# only elf supported
-config KCORE_ELF
-       def_bool y
-       depends on PROC_FS
-
 source "fs/Kconfig.binfmt"
 
 endmenu