Merge tag 'gcc-plugins-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index d5066593a60fdb1e24fa7328a1a13a0ae506d617..19483aea4bbc9e15b51f0bc7f200880902794a74 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -96,6 +96,7 @@ config KPROBES_ON_FTRACE
 
 config UPROBES
        def_bool n
+       depends on ARCH_SUPPORTS_UPROBES
        help
          Uprobes is the user-space counterpart to kprobes: they
          enable instrumentation applications (such as 'perf probe')
@@ -517,6 +518,9 @@ config HAVE_CONTEXT_TRACKING
 config HAVE_VIRT_CPU_ACCOUNTING
        bool
 
+config ARCH_HAS_SCALED_CPUTIME
+       bool
+
 config HAVE_VIRT_CPU_ACCOUNTING_GEN
        bool
        default y if 64BIT