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

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

diff --git a/[refs] b/[refs]
index a07270f74a7a..e7ff1ba0be44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4beaa66add8aebf83ab16d2fde4e4de8dac36df
+refs/heads/master: b4278c961aca320839964e23cfc7906ff61af0c2
diff --git a/trunk/fs/proc/proc_net.c b/trunk/fs/proc/proc_net.c
index fe72cd073dea..30f7c678424b 100644
--- a/trunk/fs/proc/proc_net.c
+++ b/trunk/fs/proc/proc_net.c
@@ -177,14 +177,6 @@ const struct file_operations proc_net_operations = {
 	.readdir	= proc_tgid_net_readdir,
 };
 
-
-struct proc_dir_entry *proc_net_fops_create(struct net *net,
-	const char *name, umode_t mode, const struct file_operations *fops)
-{
-	return proc_create(name, mode, net->proc_net, fops);
-}
-EXPORT_SYMBOL_GPL(proc_net_fops_create);
-
 void proc_net_remove(struct net *net, const char *name)
 {
 	remove_proc_entry(name, net->proc_net);
diff --git a/trunk/include/linux/proc_fs.h b/trunk/include/linux/proc_fs.h
index 32676b35d2f5..35ee1891ae25 100644
--- a/trunk/include/linux/proc_fs.h
+++ b/trunk/include/linux/proc_fs.h
@@ -171,8 +171,6 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
 	return res;
 }
  
-extern struct proc_dir_entry *proc_net_fops_create(struct net *net,
-	const char *name, umode_t mode, const struct file_operations *fops);
 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);
@@ -184,7 +182,6 @@ extern int proc_alloc_inum(unsigned int *pino);
 extern void proc_free_inum(unsigned int inum);
 #else
 
-#define proc_net_fops_create(net, name, mode, fops)  ({ (void)(mode), NULL; })
 static inline void proc_net_remove(struct net *net, const char *name) {}
 
 static inline void proc_flush_task(struct task_struct *task)