From 67f42acd97b7f4b43f18c3c7375df4a5f0e02c18 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 28 Oct 2009 13:33:10 +0000
Subject: [PATCH] --- yaml --- r: 177826 b: refs/heads/master c:
 a6f5aa1ea05686ad6e84593a00a04161e6dfb3a3 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/module.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d46f19e03a7..421e46480dad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c017b4be3e84176cab10eca5e6c4faeb8cfc6f3e
+refs/heads/master: a6f5aa1ea05686ad6e84593a00a04161e6dfb3a3
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 1eb952097077..dd29ba43c34f 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -2380,6 +2380,12 @@ static noinline struct module *load_module(void __user *umod,
 					 "_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_FTRACE_MCOUNT_RECORD
 	/* sechdrs[0].sh_size is always zero */