From: Nick Alcock <nick.alcock@oracle.com>
Date: Thu, 11 Aug 2011 15:48:19 +0000 (+0100)
Subject: dtrace: conflict with CONFIG_DEBUG_LOCK_ALLOC
X-Git-Tag: v4.1.12-92~313^2~173
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c8d6ef1f2e7b3807544532b2011628fb0b690ab8;p=users%2Fjedix%2Flinux-maple.git

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 b920ff3b7eb1..faaa91101688 100644
--- 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.