Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / kernel / audit.h

diff --git a/kernel/audit.h b/kernel/audit.h
index b779642b29af9401fd15246816c376ec86e4fcab..8df132214606f2b06e08e916196779b1aee64ad6 100644 (file)
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -209,7 +209,7 @@ struct audit_context {
 #endif
 };
 
-extern int audit_ever_enabled;
+extern u32 audit_ever_enabled;
 
 extern void audit_copy_inode(struct audit_names *name,
                             const struct dentry *dentry,
@@ -240,18 +240,23 @@ extern int audit_uid_comparator(kuid_t left, u32 op, kuid_t right);
 extern int audit_gid_comparator(kgid_t left, u32 op, kgid_t right);
 extern int parent_len(const char *path);
 extern int audit_compare_dname_path(const char *dname, const char *path, int plen);
-extern struct sk_buff *            audit_make_reply(int pid, int seq, int type,
-                                            int done, int multi,
-                                            const void *payload, int size);
+extern struct sk_buff *audit_make_reply(__u32 portid, int seq, int type,
+                                       int done, int multi,
+                                       const void *payload, int size);
 extern void                audit_panic(const char *message);
 
 struct audit_netlink_list {
-       int pid;
+       __u32 portid;
+       struct net *net;
        struct sk_buff_head q;
 };
 
 int audit_send_list(void *);
 
+struct audit_net {
+       struct sock *nlsk;
+};
+
 extern int selinux_audit_rule_update(void);
 
 extern struct mutex audit_filter_mutex;