diff options
author | Steve French <sfrench@us.ibm.com> | 2008-03-14 19:29:18 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 19:29:18 +0000 |
commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /fs/proc/base.c | |
parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) | |
download | op-kernel-dev-ebe8912be214662c8289977fb416c1f015df4a0b.zip op-kernel-dev-ebe8912be214662c8289977fb416c1f015df4a0b.tar.gz |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 91a1bd6..9a4da0a 100644 --- 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), |