]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
dtrace: only call dtrace functions when CONFIG_DTRACE is set
authorKris Van Hees <kris.van.hees@oracle.com>
Mon, 17 Aug 2015 20:29:33 +0000 (16:29 -0400)
committerKris Van Hees <kris.van.hees@oracle.com>
Mon, 17 Aug 2015 22:12:01 +0000 (18:12 -0400)
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>
kernel/module.c

index fb4149f42423b2ae455f844e45d99590fc629295..f696197b5174d3fd3868f0581acc4e31c898cd87 100644 (file)
@@ -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);