Merge kroah.com:/home/greg/linux/BK/bleed-2.5

into kroah.com:/home/greg/linux/BK/gregkh-2.5

1 files changed, 10 insertions, 1 deletions

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 21616fbf2c6e..9f15eadedb46 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -163,6 +163,15 @@ static inline struct proc_dir_entry *proc_net_create(const char *name,
 	return create_proc_info_entry(name,mode,proc_net,get_info);
 }
 
+static inline struct proc_dir_entry *proc_net_fops_create(const char *name,
+	mode_t mode, struct file_operations *fops)
+{
+	struct proc_dir_entry *res = create_proc_entry(name, mode, proc_net);
+	if (res)
+		res->proc_fops = fops;
+	return res;
+}
+
 static inline void proc_net_remove(const char *name)
 {
 	remove_proc_entry(name,proc_net);
@@ -171,7 +180,7 @@ static inline void proc_net_remove(const char *name)
 #else
 
 #define proc_root_driver NULL
-
+#define proc_net_fops_create(name,mode,fops) do {} while(0)
 static inline struct proc_dir_entry *proc_net_create(const char *name, mode_t mode, 
 	get_info_t *get_info) {return NULL;}
 static inline void proc_net_remove(const char *name) {}