ftrace: Join functions ftrace_module_init() and ftrace_init_module()

[mirror_ubuntu-artful-kernel.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index e290a30f2d0b7712a300f97045239edb7766f8a7..29fcc2c765838d6ade7be21bc2eddaac6da11b4e 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4980,19 +4980,16 @@ void ftrace_release_mod(struct module *mod)
        mutex_unlock(&ftrace_lock);
 }
 
-static void ftrace_init_module(struct module *mod,
-                              unsigned long *start, unsigned long *end)
+void ftrace_module_init(struct module *mod)
 {
+       unsigned long *start = mod->ftrace_callsites;
+       unsigned long *end = mod->ftrace_callsites +
+                               mod->num_ftrace_callsites;
+
        if (ftrace_disabled || start == end)
                return;
-       ftrace_process_locs(mod, start, end);
-}
 
-void ftrace_module_init(struct module *mod)
-{
-       ftrace_init_module(mod, mod->ftrace_callsites,
-                          mod->ftrace_callsites +
-                          mod->num_ftrace_callsites);
+       ftrace_process_locs(mod, start, end);
 }
 
 static int ftrace_module_notify_exit(struct notifier_block *self,