aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/audit.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-28 12:30:29 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 12:30:29 -0400
commit35ebbae2836a361330b784706b7140c90a346a53 (patch)
treeada3c046a8b6bfdf21bcb0932b4b65c95c2af073 /include/linux/audit.h
parentc6a33e2464edd87f8c12cc2d11369a5b44c65b77 (diff)
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff)
downloadkernel_samsung_aries-35ebbae2836a361330b784706b7140c90a346a53.zip
kernel_samsung_aries-35ebbae2836a361330b784706b7140c90a346a53.tar.gz
kernel_samsung_aries-35ebbae2836a361330b784706b7140c90a346a53.tar.bz2
Merge branch 'master'
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r--include/linux/audit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index b2a2509..da3c019 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -260,11 +260,11 @@ extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
#ifdef CONFIG_AUDIT
/* These are defined in audit.c */
/* Public API */
-extern void audit_log(struct audit_context *ctx, int gfp_mask,
+extern void audit_log(struct audit_context *ctx, gfp_t gfp_mask,
int type, const char *fmt, ...)
__attribute__((format(printf,4,5)));
-extern struct audit_buffer *audit_log_start(struct audit_context *ctx, int gfp_mask, int type);
+extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type);
extern void audit_log_format(struct audit_buffer *ab,
const char *fmt, ...)
__attribute__((format(printf,2,3)));