diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-16 01:57:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-16 01:57:13 -0500 |
| commit | 985809608f758a8d3ddda4ce5a53ed0e57fb9e1b (patch) | |
| tree | 063fe72ed9bb3410c3293c83a7882cecc46e7410 /kernel/module.c | |
| parent | c91add5fa68ea9b1f2923b3788c5dae0e60e1f6b (diff) | |
| parent | 1c80025a49855b12fa09bb6db71820e3367b1369 (diff) | |
Merge branch 'tracing/ftrace' into tracing/function-return-tracer
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 1f4cc00e0c20..69791274e899 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -2201,7 +2201,7 @@ static noinline struct module *load_module(void __user *umod, | |||
| 2201 | /* sechdrs[0].sh_size is always zero */ | 2201 | /* sechdrs[0].sh_size is always zero */ |
| 2202 | mseg = section_objs(hdr, sechdrs, secstrings, "__mcount_loc", | 2202 | mseg = section_objs(hdr, sechdrs, secstrings, "__mcount_loc", |
| 2203 | sizeof(*mseg), &num_mcount); | 2203 | sizeof(*mseg), &num_mcount); |
| 2204 | ftrace_init_module(mseg, mseg + num_mcount); | 2204 | ftrace_init_module(mod, mseg, mseg + num_mcount); |
| 2205 | 2205 | ||
| 2206 | err = module_finalize(hdr, sechdrs, mod); | 2206 | err = module_finalize(hdr, sechdrs, mod); |
| 2207 | if (err < 0) | 2207 | if (err < 0) |