diff mbox

[v7,01/15] uprobes: Kconfig dependency fix

Message ID 1394223040-17129-2-git-send-email-dave.long@linaro.org
State Accepted
Commit 09294e31b1779dda22f420c195994a0db54c9a92
Headers show

Commit Message

David Long March 7, 2014, 8:10 p.m. UTC 
From: "David A. Long" <dave.long@linaro.org>

Suggested change from Oleg Nesterov. Fixes incomplete dependencies
for uprobes feature.

Signed-off-by: David A. Long <dave.long@linaro.org>
---
 arch/Kconfig         | 6 +-----
 kernel/trace/Kconfig | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

Comments

Oleg Nesterov March 8, 2014, 3:29 p.m. UTC | #1 
On 03/07, David Long wrote:
>
> From: "David A. Long" <dave.long@linaro.org>
>
> Suggested change from Oleg Nesterov.

Actually this was suggested by Srikar ;) I hope he won't mind.

> Fixes incomplete dependencies
> for uprobes feature.

Acked-by: Oleg Nesterov <oleg@redhat.com>



Once this change is merged I'll try to untangle UPROBES and PERF.
Perhaps we should change Makefiles as Russell suggests, or we can
simply move uprobes.c to kernel/.

Oleg.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/arch/Kconfig b/arch/Kconfig
index 80bbb8c..97ff872 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 015f85a..8639819 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