From: Nick Alcock <nick.alcock@oracle.com>
Date: Wed, 31 Jul 2013 13:42:07 +0000 (+0100)
Subject: dtrace: CONFIG_UPROBES is needed by CONFIG_DT_FASTTRAP, not CONFIG_DTRACE
X-Git-Tag: v4.1.12-92~313^2~71
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=63169a598200993763d174e61d68135d625249b6;p=users%2Fjedix%2Flinux-maple.git

dtrace: CONFIG_UPROBES is needed by CONFIG_DT_FASTTRAP, not CONFIG_DTRACE

So move it.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---

diff --git a/kernel/dtrace/Kconfig b/kernel/dtrace/Kconfig
index 45499d970baa..cf9f293e6db0 100644
--- a/kernel/dtrace/Kconfig
+++ b/kernel/dtrace/Kconfig
@@ -9,7 +9,6 @@ menuconfig DTRACE
 	depends on X86_64 && !DEBUG_LOCK_ALLOC
 	select KALLSYMS
 	select WAITFD
-	select UPROBES
 	select CTF if (!DT_DISABLE_CTF)
 	select STRIP_ASM_SYMS if (!DT_DISABLE_CTF)
 	select DEBUG_INFO if (!DT_DISABLE_CTF)
@@ -29,6 +28,7 @@ if DT_CORE
 config DT_FASTTRAP
 	tristate "Fasttrap Tracing"
 	default m
+	select UPROBES
 	help
 	  To be written.