summaryrefslogtreecommitdiffstats
path: root/kernel/trace/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-05-05 08:20:52 +0200
committerIngo Molnar <mingo@kernel.org>2017-05-05 08:21:03 +0200
commit415812f2d6b856d33ede9bf4a2b95575dbbb3d4e (patch)
tree4daf9ca52f89ea59453538b406f584d47c77aff3 /kernel/trace/Kconfig
parentx86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic() (diff)
parentMerge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
downloadlinux-415812f2d6b856d33ede9bf4a2b95575dbbb3d4e.tar.xz
linux-415812f2d6b856d33ede9bf4a2b95575dbbb3d4e.zip
Merge branch 'linus' into x86/urgent, to pick up dependent commits
We are going to fix a bug introduced by a more recent commit, so refresh the tree. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/Kconfig')
-rw-r--r--kernel/trace/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index d4a06e714645..9619b5768e4b 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -455,7 +455,7 @@ config UPROBE_EVENTS
select UPROBES
select PROBE_EVENTS
select TRACING
- default n
+ default y
help
This allows the user to add tracing events on top of userspace
dynamic events (similar to tracepoints) on the fly via the trace