diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /fs/proc/base.c | |
| parent | 938b93adb2642885e688390396472d22a7548748 (diff) | |
| parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 9a4da0aae02e..770de444eba0 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -2270,7 +2270,7 @@ static const struct pid_entry tgid_base_stuff[] = { | |||
| 2270 | DIR("fd", S_IRUSR|S_IXUSR, fd), | 2270 | DIR("fd", S_IRUSR|S_IXUSR, fd), |
| 2271 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), | 2271 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), |
| 2272 | #ifdef CONFIG_NET | 2272 | #ifdef CONFIG_NET |
| 2273 | DIR("net", S_IRUGO|S_IXUSR, net), | 2273 | DIR("net", S_IRUGO|S_IXUGO, net), |
| 2274 | #endif | 2274 | #endif |
| 2275 | REG("environ", S_IRUSR, environ), | 2275 | REG("environ", S_IRUSR, environ), |
| 2276 | INF("auxv", S_IRUSR, pid_auxv), | 2276 | INF("auxv", S_IRUSR, pid_auxv), |