From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Mon, 14 Nov 2011 15:17:45 +0000 (-0500)
Subject: dtrace: process the SDT probe point info early in boot
X-Git-Tag: v4.1.12-92~313^2~161
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26b4b36127cabdba5102b4fb3aee508cdb54ad43;p=users%2Fjedix%2Flinux-maple.git

dtrace: process the SDT probe point info early in boot

If DTrace SDT support has been enabled (built-in or as module),
process the SDT probe point info early at boot time (before SMP is actually
enabled).  For now, provide some verbose info on the probe points getting
resolved.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/include/linux/sdt.h b/include/linux/sdt.h
index 9484ffb678d7..bd7e7db46159 100644
--- a/include/linux/sdt.h
+++ b/include/linux/sdt.h
@@ -133,7 +133,7 @@ struct reloc_info {
 void dtrace_register_builtins(void);
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__, ## args)
+#define DPRINTK(fmt, args...) printk(KERN_INFO "%s: " fmt, __func__, ## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
diff --git a/init/main.c b/init/main.c
index bddbc47e9455..da860d2f58c8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -674,7 +674,7 @@ asmlinkage __visible void __init start_kernel(void)
 
 	ftrace_init();
 
-#if defined(CONFIG_DT_SDT)
+#if defined(CONFIG_DT_SDT) || defined(CONFIG_DT_SDT_MODULE)
 	dtrace_register_builtins();
 #endif
 
diff --git a/kernel/dtrace/sdt_register.c b/kernel/dtrace/sdt_register.c
index e2bdf3a90b58..aaaf13fd7a8f 100644
--- a/kernel/dtrace/sdt_register.c
+++ b/kernel/dtrace/sdt_register.c
@@ -121,9 +121,4 @@ void dtrace_register_builtins(void)
 		ri = nextri;
 		DPRINTK("SDT relocs: next entry at 0x%p\n", ri);
 	}
-
-#if 0
-	dtrace_module_loaded(kernmod);
-#endif
 }
-EXPORT_SYMBOL(dtrace_register_builtins);