From b702e5e721f9dc017e6255f66401676ad8848b1b Mon Sep 17 00:00:00 2001
From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Mon, 18 Feb 2013 01:34:57 +0000
Subject: [PATCH] --- yaml --- r: 352524 b: refs/heads/master c:
 c2399059a389ba686fa7f45d8913a708914752c4 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/proc/proc_net.c      | 6 ------
 trunk/include/linux/proc_fs.h | 3 ---
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 2f5d511e9018..922a57cb9966 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece31ffd539e8e2b586b1ca5f50bc4f4591e3893
+refs/heads/master: c2399059a389ba686fa7f45d8913a708914752c4
diff --git a/trunk/fs/proc/proc_net.c b/trunk/fs/proc/proc_net.c
index 30f7c678424b..3131a03d7d37 100644
--- a/trunk/fs/proc/proc_net.c
+++ b/trunk/fs/proc/proc_net.c
@@ -177,12 +177,6 @@ const struct file_operations proc_net_operations = {
 	.readdir	= proc_tgid_net_readdir,
 };
 
-void proc_net_remove(struct net *net, const char *name)
-{
-	remove_proc_entry(name, net->proc_net);
-}
-EXPORT_SYMBOL_GPL(proc_net_remove);
-
 static __net_init int proc_net_ns_init(struct net *net)
 {
 	struct proc_dir_entry *netd, *net_statd;
diff --git a/trunk/include/linux/proc_fs.h b/trunk/include/linux/proc_fs.h
index 35ee1891ae25..319f69422667 100644
--- a/trunk/include/linux/proc_fs.h
+++ b/trunk/include/linux/proc_fs.h
@@ -171,7 +171,6 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
 	return res;
 }
  
-extern void proc_net_remove(struct net *net, const char *name);
 extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
 	struct proc_dir_entry *parent);
 
@@ -182,8 +181,6 @@ extern int proc_alloc_inum(unsigned int *pino);
 extern void proc_free_inum(unsigned int inum);
 #else
 
-static inline void proc_net_remove(struct net *net, const char *name) {}
-
 static inline void proc_flush_task(struct task_struct *task)
 {
 }