dtrace: ensure that the trap handler is regisstered only once

Register with first use.

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

diff --git a/init/main.c b/init/main.c
index 84dade25d3ca423c0bd3aaa3aa7e27bd919dabe1..cc9bb01104b0124daa2cf04d84233535d6cd056b 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -674,12 +674,6 @@ asmlinkage __visible void __init start_kernel(void)
 
        ftrace_init();
 
-#if defined(CONFIG_DT_SDT) || defined(CONFIG_DT_SDT_MODULE)
-# if FIXME
-       dtrace_register_builtins();
-# endif
-#endif
-
        /* Do the rest non-__init'ed, we're now alive */
        rest_init();
 }

diff --git a/kernel/dtrace/dtrace_os.c b/kernel/dtrace/dtrace_os.c
index 3a8caf87ec6ef51a32e62f19a101e57a12c359b2..b20e9bc8c3aaa48c11ee712c0109f422366349cf 100644 (file)
--- a/kernel/dtrace/dtrace_os.c
+++ b/kernel/dtrace/dtrace_os.c
@@ -325,8 +325,10 @@ static int dtrace_enabled = 0;
 
 void dtrace_enable(void)
 {
-       if (!dtrace_enabled)
+       if (!dtrace_enabled) {
                register_die_notifier(&dtrace_die);
+               dtrace_enabled = 1;
+       }
 }
 EXPORT_SYMBOL(dtrace_enable);
 
@@ -336,6 +338,7 @@ void dtrace_disable(void)
                return;
 
        unregister_die_notifier(&dtrace_die);
+       dtrace_enabled = 0;
 }
 EXPORT_SYMBOL(dtrace_disable);