1 files changed, 13 insertions, 10 deletions

diff --git a/include/linux/audit.h b/include/linux/audit.h
index a40641954c29..ec1464df4c60 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -43,6 +43,7 @@ struct mq_attr;
 struct mqstat;
 struct audit_watch;
 struct audit_tree;
+struct sk_buff;
 
 struct audit_krule {
         int                     vers_ops;
@@ -137,7 +138,7 @@ static inline void audit_syscall_exit(void *pt_regs)
 {
         if (unlikely(current->audit_context)) {
                 int success = is_syscall_success(pt_regs);
-                int return_code = regs_return_value(pt_regs);
+                long return_code = regs_return_value(pt_regs);
 
                 __audit_syscall_exit(success, return_code);
         }
@@ -202,7 +203,7 @@ static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
         return tsk->loginuid;
 }
 
-static inline int audit_get_sessionid(struct task_struct *tsk)
+static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
 {
         return tsk->sessionid;
 }
@@ -220,7 +221,7 @@ extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
 extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
                                   const struct cred *new,
                                   const struct cred *old);
-extern void __audit_log_capset(pid_t pid, const struct cred *new, const struct cred *old);
+extern void __audit_log_capset(const struct cred *new, const struct cred *old);
 extern void __audit_mmap_fd(int fd, int flags);
 
 static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
@@ -285,11 +286,11 @@ static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
         return 0;
 }
 
-static inline void audit_log_capset(pid_t pid, const struct cred *new,
+static inline void audit_log_capset(const struct cred *new,
                                    const struct cred *old)
 {
         if (unlikely(!audit_dummy_context()))
-                __audit_log_capset(pid, new, old);
+                __audit_log_capset(new, old);
 }
 
 static inline void audit_mmap_fd(int fd, int flags)
@@ -359,7 +360,7 @@ static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
 {
         return INVALID_UID;
 }
-static inline int audit_get_sessionid(struct task_struct *tsk)
+static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
 {
         return -1;
 }
@@ -397,8 +398,8 @@ static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
 {
         return 0;
 }
-static inline void audit_log_capset(pid_t pid, const struct cred *new,
-                                   const struct cred *old)
+static inline void audit_log_capset(const struct cred *new,
+                                    const struct cred *old)
 { }
 static inline void audit_mmap_fd(int fd, int flags)
 { }
@@ -461,9 +462,11 @@ extern int		    audit_update_lsm_rules(void);
                                 /* Private API (for audit.c only) */
 extern int audit_filter_user(int type);
 extern int audit_filter_type(int type);
-extern int  audit_receive_filter(int type, int pid, int seq,
+extern int audit_rule_change(int type, __u32 portid, int seq,
                                 void *data, size_t datasz);
-extern int audit_enabled;
+extern int audit_list_rules_send(struct sk_buff *request_skb, int seq);
+
+extern u32 audit_enabled;
 #else /* CONFIG_AUDIT */
 static inline __printf(4, 5)
 void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,