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

[linux.git] / arch / tile / Kconfig

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 7fcd492adbfcfb030a34c2f4d34558fc9a20ad81..a07e31b50d3f783e92ee1ccfab11293308d40472 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -27,6 +27,7 @@ config TILE
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select HAVE_DEBUG_STACKOVERFLOW
        select ARCH_WANT_FRAME_POINTERS
+       select HAVE_CONTEXT_TRACKING
 
 # FIXME: investigate whether we need/want these options.
 #      select HAVE_IOREMAP_PROT
@@ -134,6 +135,7 @@ config TILEGX
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_ARCH_KGDB
+       select ARCH_SUPPORTS_ATOMIC_RMW
 
 config TILEPRO
        def_bool !TILEGX
@@ -146,6 +148,11 @@ config ARCH_DEFCONFIG
        default "arch/tile/configs/tilepro_defconfig" if !TILEGX
        default "arch/tile/configs/tilegx_defconfig" if TILEGX
 
+config PGTABLE_LEVELS
+       int
+       default 3 if 64BIT
+       default 2
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"