From f5dc497401b59dc1cd3b2e19314733fa8ba6a5f7 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 15 May 2013 20:46:23 +0100 Subject: [PATCH] --- yaml --- r: 375751 b: refs/heads/master c: 89c837351db0b9b52fd572ec8b0445a42e59b75c h: refs/heads/master i: 375749: 30a71d01f03ccf0c0eabb2e2f0c97da2ac83e68c 375747: 68ccb332d1bc9da0ff6dd3dc277d01b977904b32 375743: c87b830290cec8297db548cfe4cef4df18cc3fed v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index d80827f5583b..f4157b702847 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06c9494c0e9bdfcaa14d6d2b096a0ff7abe8494f +refs/heads/master: 89c837351db0b9b52fd572ec8b0445a42e59b75c diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index 06f496a5d182..cab4bce49c23 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -2769,24 +2769,11 @@ static void find_module_sections(struct module *mod, struct load_info *info) mod->trace_events = section_objs(info, "_ftrace_events", sizeof(*mod->trace_events), &mod->num_trace_events); - /* - * This section contains pointers to allocated objects in the trace - * code and not scanning it leads to false positives. - */ - 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 */