diff options
| author | David A. Long <dave.long@linaro.org> | 2014-03-07 10:32:22 -0500 |
|---|---|---|
| committer | David A. Long <dave.long@linaro.org> | 2014-03-18 16:39:33 -0400 |
| commit | 09294e31b1779dda22f420c195994a0db54c9a92 (patch) | |
| tree | 73344191daf123599cae31e245dedb5f95a6d4f6 | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
| download | linux-stable-09294e31b1779dda22f420c195994a0db54c9a92.tar.gz linux-stable-09294e31b1779dda22f420c195994a0db54c9a92.tar.bz2 linux-stable-09294e31b1779dda22f420c195994a0db54c9a92.zip | |
uprobes: Kconfig dependency fix
Suggested change from Oleg Nesterov. Fixes incomplete dependencies
for uprobes feature.
Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
| -rw-r--r-- | arch/Kconfig | 6 | ||||
| -rw-r--r-- | kernel/trace/Kconfig | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 80bbb8ccd0d1..97ff872c7acc 100644 --- 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 diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 015f85aaca08..8639819f6cef 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -424,6 +424,7 @@ config UPROBE_EVENT bool "Enable uprobes-based dynamic events" depends on ARCH_SUPPORTS_UPROBES depends on MMU + depends on PERF_EVENTS select UPROBES select PROBE_EVENTS select TRACING |