|
@@ -5037,29 +5037,36 @@ void ftrace_module_init(struct module *mod)
|
|
|
|
|
|
ftrace_process_locs(mod, mod->ftrace_callsites,
|
|
|
mod->ftrace_callsites + mod->num_ftrace_callsites);
|
|
|
- ftrace_module_enable(mod);
|
|
|
}
|
|
|
|
|
|
-static int ftrace_module_notify_exit(struct notifier_block *self,
|
|
|
- unsigned long val, void *data)
|
|
|
+static int ftrace_module_notify(struct notifier_block *self,
|
|
|
+ unsigned long val, void *data)
|
|
|
{
|
|
|
struct module *mod = data;
|
|
|
|
|
|
- if (val == MODULE_STATE_GOING)
|
|
|
+ switch (val) {
|
|
|
+ case MODULE_STATE_COMING:
|
|
|
+ ftrace_module_enable(mod);
|
|
|
+ break;
|
|
|
+ case MODULE_STATE_GOING:
|
|
|
ftrace_release_mod(mod);
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
#else
|
|
|
-static int ftrace_module_notify_exit(struct notifier_block *self,
|
|
|
- unsigned long val, void *data)
|
|
|
+static int ftrace_module_notify(struct notifier_block *self,
|
|
|
+ unsigned long val, void *data)
|
|
|
{
|
|
|
return 0;
|
|
|
}
|
|
|
#endif /* CONFIG_MODULES */
|
|
|
|
|
|
-struct notifier_block ftrace_module_exit_nb = {
|
|
|
- .notifier_call = ftrace_module_notify_exit,
|
|
|
+struct notifier_block ftrace_module_nb = {
|
|
|
+ .notifier_call = ftrace_module_notify,
|
|
|
.priority = INT_MIN, /* Run after anything that can remove kprobes */
|
|
|
};
|
|
|
|
|
@@ -5091,7 +5098,7 @@ void __init ftrace_init(void)
|
|
|
__start_mcount_loc,
|
|
|
__stop_mcount_loc);
|
|
|
|
|
|
- ret = register_module_notifier(&ftrace_module_exit_nb);
|
|
|
+ ret = register_module_notifier(&ftrace_module_nb);
|
|
|
if (ret)
|
|
|
pr_warning("Failed to register trace ftrace module exit notifier\n");
|
|
|
|