dtrace: conflict with CONFIG_DEBUG_LOCK_ALLOC

DTrace breaks when CONFIG_DEBUG_LOCK_ALLOC as this pulls in GPLONLY functions.
Block this combination.

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

diff --git a/kernel/dtrace/Kconfig b/kernel/dtrace/Kconfig
index b920ff3b7eb1200e1c36d0b5042014bf8e952b8d..faaa91101688ece6b0aed0dc95b61fe3034c89ad 100644 (file)
--- a/kernel/dtrace/Kconfig
+++ b/kernel/dtrace/Kconfig
@@ -5,7 +5,7 @@
 menuconfig DTRACE
        bool "DTrace (Dynamic Tracing) Support"
        default y
-       depends on X86_64
+       depends on X86_64 && !DEBUG_LOCK_ALLOC
        select KALLSYMS
        help
          To be written.