Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / kernel / audit.h

diff --git a/kernel/audit.h b/kernel/audit.h
index 4b602cdcabef433e73a313734b127c72f9b6dffb..6f733920fd32e1cc88fe6840620720ec8cb62978 100644 (file)
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/mutex.h>
 #include <linux/fs.h>
 #include <linux/audit.h>
 
@@ -53,9 +54,11 @@ enum audit_state {
 
 /* Rule lists */
 struct audit_field {
-       u32                     type;
-       u32                     val;
-       u32                     op;
+       u32                             type;
+       u32                             val;
+       u32                             op;
+       char                            *se_str;
+       struct selinux_audit_rule       *se_rule;
 };
 
 struct audit_krule {
@@ -84,4 +87,6 @@ extern void               audit_send_reply(int pid, int seq, int type,
                                             void *payload, int size);
 extern void                audit_log_lost(const char *message);
 extern void                audit_panic(const char *message);
-extern struct semaphore audit_netlink_sem;
+extern struct mutex audit_netlink_mutex;
+
+extern int selinux_audit_rule_update(void);