diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /fs/proc/base.c | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
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 808cbdc193d3..c447e0743a3c 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -2441,7 +2441,7 @@ static const struct pid_entry tgid_base_stuff[] = { | |||
| 2441 | REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), | 2441 | REG("oom_adj", S_IRUGO|S_IWUSR, oom_adjust), |
| 2442 | #ifdef CONFIG_AUDITSYSCALL | 2442 | #ifdef CONFIG_AUDITSYSCALL |
| 2443 | REG("loginuid", S_IWUSR|S_IRUGO, loginuid), | 2443 | REG("loginuid", S_IWUSR|S_IRUGO, loginuid), |
| 2444 | REG("sessionid", S_IRUSR, sessionid), | 2444 | REG("sessionid", S_IRUGO, sessionid), |
| 2445 | #endif | 2445 | #endif |
| 2446 | #ifdef CONFIG_FAULT_INJECTION | 2446 | #ifdef CONFIG_FAULT_INJECTION |
| 2447 | REG("make-it-fail", S_IRUGO|S_IWUSR, fault_inject), | 2447 | REG("make-it-fail", S_IRUGO|S_IWUSR, fault_inject), |