From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Mon, 17 Aug 2015 20:29:33 +0000 (-0400)
Subject: dtrace: only call dtrace functions when CONFIG_DTRACE is set
X-Git-Tag: v4.1.12-92~300^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=135c4073035ae7a8a691caca4b09481c6fd5adb0;p=users%2Fjedix%2Flinux-maple.git

dtrace: only call dtrace functions when CONFIG_DTRACE is set

The call to dtrace_sdt_register_module() in complete_formation()
should only be done when CONFIG_DTRACE is set.

Orabug: 21647525

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---

diff --git a/kernel/module.c b/kernel/module.c
index fb4149f42423..f696197b5174 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3202,7 +3202,9 @@ static int complete_formation(struct module *mod, struct load_info *info)
 {
 	int err;
 
+#ifdef CONFIG_DTRACE
 	dtrace_sdt_register_module(mod);
+#endif
 
 	mutex_lock(&module_mutex);