From ef03e4b8118ee212457aa466483fd99eed49b66d Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 30 Jul 2012 14:42:48 -0700
Subject: [PATCH] --- yaml --- r: 319982 b: refs/heads/master c:
 fd4b616b0fbb77e3f349e7d60914f2b7c7e39f9c h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/sysctl.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c02f015e2afb..22b741d899a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d7e01d7877a397655277a920aeaa3830ed9461
+refs/heads/master: fd4b616b0fbb77e3f349e7d60914f2b7c7e39f9c
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index b46f496405e4..97186b99b0e4 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -30,6 +30,7 @@
 #include <linux/security.h>
 #include <linux/ctype.h>
 #include <linux/kmemcheck.h>
+#include <linux/kmemleak.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -1556,7 +1557,10 @@ static struct ctl_table dev_table[] = {
 
 int __init sysctl_init(void)
 {
-	register_sysctl_table(sysctl_base_table);
+	struct ctl_table_header *hdr;
+
+	hdr = register_sysctl_table(sysctl_base_table);
+	kmemleak_not_leak(hdr);
 	return 0;
 }