1 files changed, 29 insertions, 2 deletions

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 24565a7ffe6d..6e1ed55f6cfc 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -26,6 +26,7 @@ config TILE
         select HAVE_SYSCALL_TRACEPOINTS
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_DEBUG_STACKOVERFLOW
+        select ARCH_WANT_FRAME_POINTERS
 
 # FIXME: investigate whether we need/want these options.
 #       select HAVE_IOREMAP_PROT
@@ -64,6 +65,9 @@ config HUGETLB_SUPER_PAGES
         depends on HUGETLB_PAGE && TILEGX
         def_bool y
 
+config GENERIC_TIME_VSYSCALL
+        def_bool y
+
 # FIXME: tilegx can implement a more efficient rwsem.
 config RWSEM_GENERIC_SPINLOCK
         def_bool y
@@ -112,10 +116,19 @@ config SMP
 config HVC_TILE
         depends on TTY
         select HVC_DRIVER
+        select HVC_IRQ if TILEGX
         def_bool y
 
 config TILEGX
-        bool "Building with TILE-Gx (64-bit) compiler and toolchain"
+        bool "Building for TILE-Gx (64-bit) processor"
+        select HAVE_FUNCTION_TRACER
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+        select HAVE_FUNCTION_GRAPH_TRACER
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE_MCOUNT_RECORD
+        select HAVE_KPROBES
+        select HAVE_KRETPROBES
+        select HAVE_ARCH_KGDB
 
 config TILEPRO
         def_bool !TILEGX
@@ -194,7 +207,7 @@ config SYSVIPC_COMPAT
         def_bool y
         depends on COMPAT && SYSVIPC
 
-# We do not currently support disabling HIGHMEM on tile64 and tilepro.
+# We do not currently support disabling HIGHMEM on tilepro.
 config HIGHMEM
         bool # "Support for more than 512 MB of RAM"
         default !TILEGX
@@ -300,6 +313,8 @@ config PAGE_OFFSET
 
 source "mm/Kconfig"
 
+source "kernel/Kconfig.preempt"
+
 config CMDLINE_BOOL
         bool "Built-in kernel command line"
         default n
@@ -396,8 +411,20 @@ config NO_IOMEM
 config NO_IOPORT
         def_bool !PCI
 
+config TILE_PCI_IO
+        bool "PCI I/O space support"
+        default n
+        depends on PCI
+        depends on TILEGX
+        ---help---
+          Enable PCI I/O space support on TILEGx. Since the PCI I/O space
+          is used by few modern PCIe endpoint devices, its support is disabled
+          by default to save the TRIO PIO Region resource for other purposes.
+
 source "drivers/pci/Kconfig"
 
+source "drivers/pci/pcie/Kconfig"
+
 config TILE_USB
         tristate "Tilera USB host adapter support"
         default y