Merge branch 'perf/core' into perf/uprobes

[firefly-linux-kernel-4.4.55.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 684eb5af439dc5cee005f51675c2db814a29bf38..e5d3778d555430654f482dba1d5b613ef70336b4 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -76,6 +76,23 @@ config OPTPROBES
        depends on KPROBES && HAVE_OPTPROBES
        depends on !PREEMPT
 
+config UPROBES
+       bool "Transparent user-space probes (EXPERIMENTAL)"
+       depends on ARCH_SUPPORTS_UPROBES && PERF_EVENTS
+       default n
+       help
+         Uprobes is the user-space counterpart to kprobes: they
+         enable instrumentation applications (such as 'perf probe')
+         to establish unintrusive probes in user-space binaries and
+         libraries, by executing handler functions when the probes
+         are hit by user-space applications.
+
+         ( These probes come in the form of single-byte breakpoints,
+           managed by the kernel and kept transparent to the probed
+           application. )
+
+         If in doubt, say "N".
+
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
        bool
        help