diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
commit | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (patch) | |
tree | 7e81977adbd73e154f53861d8577d3ab92611c8c /kernel | |
parent | 6684e323a236d40461f27d36b38c6b70aabc9e71 (diff) | |
parent | 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/auditfilter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 6c61263ff96..74cc0fc6bb8 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -311,6 +311,7 @@ int audit_match_class(int class, unsigned syscall) return classes[class][AUDIT_WORD(syscall)] & AUDIT_BIT(syscall); } +#ifdef CONFIG_AUDITSYSCALL static inline int audit_match_class_bits(int class, u32 *mask) { int i; @@ -347,6 +348,7 @@ static int audit_match_signal(struct audit_entry *entry) return 1; } } +#endif /* Common user-space to kernel rule translation. */ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) |