From f9d7474607c32f134b790b201b5e8fc32e9a3cfb Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Mon, 16 Apr 2012 19:58:28 +0000
Subject: [PATCH] --- yaml --- r: 300799 b: refs/heads/master c:
 798ec84d45754403571d6387396236e877965c5a h: refs/heads/master i:   300797:
 29b5cf81fb2abb9b42c113121a51369b73ea2336   300795:
 275c79d978594406cf9b2294ddbb5eef80925eda   300791:
 7892a669d038cb02b8da325a99f400845a85f4d4   300783:
 451a12c8b8478079e15be80673e82e3f75f85076   300767:
 1a760396bf7dc84bae6402855066aad527a1d56b   300735:
 c0d512085906894a838e83bd4d17f7b8ca768575   300671:
 74be49a5d28cb33bab28a6dae1d2b92fdc30bb29   300543:
 2e7f62b682397611694dc1fc0d112507aec8be2f v: v3

---
 [refs]                           | 2 +-
 trunk/net/core/sysctl_net_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dd487abef8cf..61b58fb7c073 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f593881089084640bffeb93c9cc49077afcec81
+refs/heads/master: 798ec84d45754403571d6387396236e877965c5a
diff --git a/trunk/net/core/sysctl_net_core.c b/trunk/net/core/sysctl_net_core.c
index 0c2850874254..cee599190261 100644
--- a/trunk/net/core/sysctl_net_core.c
+++ b/trunk/net/core/sysctl_net_core.c
@@ -256,7 +256,7 @@ static __init int sysctl_core_init(void)
 {
 	static struct ctl_table empty[1];
 
-	register_sysctl_paths(net_core_path, empty);
+	kmemleak_not_leak(register_sysctl_paths(net_core_path, empty));
 	register_net_sysctl_rotable(net_core_path, net_core_table);
 	return register_pernet_subsys(&sysctl_core_ops);
 }