diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 15:15:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 15:15:10 -0400 |
| commit | a4480ac4f966384f9d2db98bffec223e4eaf6150 (patch) | |
| tree | 25760cb0412316ef41cc73fa6c0ac6c4a577025f /include | |
| parent | 4f46accee45d74a408e417c04c0ed1543a7c51e9 (diff) | |
| parent | d8de72473effd674a3c1fe9621821f406f5587c9 (diff) | |
Merge branch 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] remove useless argument type in audit_filter_user()
[PATCH] audit: fix kernel-doc parameter notation
[PATCH] kernel/audit.c: nlh->nlmsg_type is gotten more than once
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/audit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 63c3bb98558f..8b82974bdc12 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -571,7 +571,7 @@ extern void audit_log_lost(const char *message); | |||
| 571 | extern int audit_update_lsm_rules(void); | 571 | extern int audit_update_lsm_rules(void); |
| 572 | 572 | ||
| 573 | /* Private API (for audit.c only) */ | 573 | /* Private API (for audit.c only) */ |
| 574 | extern int audit_filter_user(struct netlink_skb_parms *cb, int type); | 574 | extern int audit_filter_user(struct netlink_skb_parms *cb); |
| 575 | extern int audit_filter_type(int type); | 575 | extern int audit_filter_type(int type); |
| 576 | extern int audit_receive_filter(int type, int pid, int uid, int seq, | 576 | extern int audit_receive_filter(int type, int pid, int uid, int seq, |
| 577 | void *data, size_t datasz, uid_t loginuid, | 577 | void *data, size_t datasz, uid_t loginuid, |