Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-3.10.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 91a1bd67ac1d6dd58da1d3db5c0691cdb7ea7525..9a4da0aae02e442e5be76fa84a0907a43e1bf848 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2269,6 +2269,9 @@ static const struct pid_entry tgid_base_stuff[] = {
        DIR("task",       S_IRUGO|S_IXUGO, task),
        DIR("fd",         S_IRUSR|S_IXUSR, fd),
        DIR("fdinfo",     S_IRUSR|S_IXUSR, fdinfo),
+#ifdef CONFIG_NET
+       DIR("net",        S_IRUGO|S_IXUSR, net),
+#endif
        REG("environ",    S_IRUSR, environ),
        INF("auxv",       S_IRUSR, pid_auxv),
        ONE("status",     S_IRUGO, pid_status),