Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return...

[safe/jmp/linux-2.6] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index fc1dff9..89bcf7c 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2192,7 +2192,7 @@ static noinline struct module *load_module(void __user *umod,
        /* sechdrs[0].sh_size is always zero */
        mseg = section_objs(hdr, sechdrs, secstrings, "__mcount_loc",
                            sizeof(*mseg), &num_mcount);
-       ftrace_init_module(mseg, mseg + num_mcount);
+       ftrace_init_module(mod, mseg, mseg + num_mcount);
 
        err = module_finalize(hdr, sechdrs, mod);
        if (err < 0)