diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /kernel/auditsc.c | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 267e484f0198..fc0f928167e7 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -250,7 +250,6 @@ struct audit_context { | |||
| 250 | #endif | 250 | #endif |
| 251 | }; | 251 | }; |
| 252 | 252 | ||
| 253 | #define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE]) | ||
| 254 | static inline int open_arg(int flags, int mask) | 253 | static inline int open_arg(int flags, int mask) |
| 255 | { | 254 | { |
| 256 | int n = ACC_MODE(flags); | 255 | int n = ACC_MODE(flags); |