diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 08:28:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 08:28:13 -0800 |
| commit | b749e3f8d7879c9c87e237d75b2256b4d1d04df2 (patch) | |
| tree | 27589e391ecb12ad51243bf7e124c6dfcc7a5b66 /include/asm-generic/audit_write.h | |
| parent | 6f8e5850df8eecee212c84831030b04f025c11ac (diff) | |
| parent | 48887e63d6e057543067327da6b091297f7fe645 (diff) | |
Merge branch 'audit.b59' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b59' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] fix broken timestamps in AVC generated by kernel threads
[patch 1/1] audit: remove excess kernel-doc
[PATCH] asm/generic: fix bug - kernel fails to build when enable some common audit code on Blackfin
[PATCH] return records for fork() both to child and parent
[PATCH] Audit: make audit=0 actually turn off audit
Diffstat (limited to 'include/asm-generic/audit_write.h')
| -rw-r--r-- | include/asm-generic/audit_write.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h index f10d367fb2a5..c5f1c2c920e2 100644 --- a/include/asm-generic/audit_write.h +++ b/include/asm-generic/audit_write.h @@ -1,6 +1,8 @@ #include <asm-generic/audit_dir_write.h> __NR_acct, +#ifdef __NR_swapon __NR_swapon, +#endif __NR_quotactl, __NR_truncate, #ifdef __NR_truncate64 |