From 989f17be2f42bc38ffb4e7ec66eb1e046c953a40 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 12 Apr 2013 02:09:03 +0100
Subject: [PATCH] --- yaml --- r: 370117 b: refs/heads/master c:
 4abfd0298900851930310e5d736a7f3a105089ec h: refs/heads/master i:   370115:
 d03dbed1fe6ba5a407d737aaaa4648739b23c821 v: v3

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

diff --git a/[refs] b/[refs]
index 2b74ef5bc009..055ceb0bd0dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bb80f240520c4148b623161e7856858c021696d
+refs/heads/master: 4abfd0298900851930310e5d736a7f3a105089ec
diff --git a/trunk/fs/proc/proc_net.c b/trunk/fs/proc/proc_net.c
index b4ac6572474f..986e83220d56 100644
--- a/trunk/fs/proc/proc_net.c
+++ b/trunk/fs/proc/proc_net.c
@@ -26,6 +26,10 @@
 
 #include "internal.h"
 
+static inline struct net *PDE_NET(struct proc_dir_entry *pde)
+{
+	return pde->parent->data;
+}
 
 static struct net *get_proc_net(const struct inode *inode)
 {
diff --git a/trunk/include/linux/proc_fs.h b/trunk/include/linux/proc_fs.h
index 8f7d8f24141a..33772248a3b1 100644
--- a/trunk/include/linux/proc_fs.h
+++ b/trunk/include/linux/proc_fs.h
@@ -187,11 +187,6 @@ static inline void *PDE_DATA(const struct inode *inode)
 	return PROC_I(inode)->pde->data;
 }
 
-static inline struct net *PDE_NET(struct proc_dir_entry *pde)
-{
-	return pde->parent->data;
-}
-
 #include <linux/signal.h>
 
 void render_sigset_t(struct seq_file *m, const char *header, sigset_t *set);