Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 80bbb8ccd0d10b319d932d1be08a2d742f957cfa..97ff872c7accf99b3779314718fe31fd60ee1d42 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -86,9 +86,7 @@ config KPROBES_ON_FTRACE
         optimize on top of function tracing.
 
 config UPROBES
-       bool "Transparent user-space probes (EXPERIMENTAL)"
-       depends on UPROBE_EVENT && PERF_EVENTS
-       default n
+       def_bool n
        select PERCPU_RWSEM
        help
          Uprobes is the user-space counterpart to kprobes: they
@@ -101,8 +99,6 @@ config UPROBES
            managed by the kernel and kept transparent to the probed
            application. )
 
-         If in doubt, say "N".
-
 config HAVE_64BIT_ALIGNED_ACCESS
        def_bool 64BIT && !HAVE_EFFICIENT_UNALIGNED_ACCESS
        help