diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 08:07:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 08:07:36 +0100 |
| commit | a89d4bd055718d3b4ddb380ee22951a1300b4096 (patch) | |
| tree | ca7a040a619f7c1fb6a42e77be7ff9147417aa2b /kernel/module.c | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
| parent | 91e86e560d0b3ce4c5fc64fd2bbb99f856a30a4e (diff) | |
| download | linux-a89d4bd055718d3b4ddb380ee22951a1300b4096.tar.gz linux-a89d4bd055718d3b4ddb380ee22951a1300b4096.tar.bz2 linux-a89d4bd055718d3b4ddb380ee22951a1300b4096.zip | |
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c index 437a74a7524a..d190664f25ff 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -2326,6 +2326,18 @@ static void find_module_sections(struct module *mod, struct load_info *info) kmemleak_scan_area(mod->trace_events, sizeof(*mod->trace_events) * mod->num_trace_events, GFP_KERNEL); #endif +#ifdef CONFIG_TRACING + mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt", + sizeof(*mod->trace_bprintk_fmt_start), + &mod->num_trace_bprintk_fmt); + /* + * This section contains pointers to allocated objects in the trace + * code and not scanning it leads to false positives. + */ + kmemleak_scan_area(mod->trace_bprintk_fmt_start, + sizeof(*mod->trace_bprintk_fmt_start) * + mod->num_trace_bprintk_fmt, GFP_KERNEL); +#endif #ifdef CONFIG_FTRACE_MCOUNT_RECORD /* sechdrs[0].sh_size is always zero */ mod->ftrace_callsites = section_objs(info, "__mcount_loc", |