diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /kernel/audit.h | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'kernel/audit.h')
| -rw-r--r-- | kernel/audit.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index 9d6717412fec..16f18cac661b 100644 --- a/kernel/audit.h +++ b/kernel/audit.h | |||
| @@ -159,11 +159,8 @@ static inline int audit_signal_info(int sig, struct task_struct *t) | |||
| 159 | return __audit_signal_info(sig, t); | 159 | return __audit_signal_info(sig, t); |
| 160 | return 0; | 160 | return 0; |
| 161 | } | 161 | } |
| 162 | extern enum audit_state audit_filter_inodes(struct task_struct *, | 162 | extern void audit_filter_inodes(struct task_struct *, struct audit_context *); |
| 163 | struct audit_context *); | ||
| 164 | extern void audit_set_auditable(struct audit_context *); | ||
| 165 | #else | 163 | #else |
| 166 | #define audit_signal_info(s,t) AUDIT_DISABLED | 164 | #define audit_signal_info(s,t) AUDIT_DISABLED |
| 167 | #define audit_filter_inodes(t,c) AUDIT_DISABLED | 165 | #define audit_filter_inodes(t,c) AUDIT_DISABLED |
| 168 | #define audit_set_auditable(c) | ||
| 169 | #endif | 166 | #endif |