diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /security/tomoyo | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/tomoyo')
| -rw-r--r-- | security/tomoyo/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index 075392c052b4..cfcb096ee97a 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include "common.h" | 12 | #include "common.h" |
| 13 | #include "tomoyo.h" | 13 | #include "tomoyo.h" |
| 14 | #include "realpath.h" | 14 | #include "realpath.h" |
| 15 | #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE]) | ||
| 16 | 15 | ||
| 17 | /* | 16 | /* |
| 18 | * tomoyo_globally_readable_file_entry is a structure which is used for holding | 17 | * tomoyo_globally_readable_file_entry is a structure which is used for holding |