Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  security: fix up documentation for security_module_enable
  Security: Introduce security= boot parameter
  Audit: Final renamings and cleanup
  SELinux: use new audit hooks, remove redundant exports
  Audit: internally use the new LSM audit hooks
  LSM/Audit: Introduce generic Audit LSM hooks
  SELinux: remove redundant exports
  Netlink: Use generic LSM hook
  Audit: use new LSM hooks instead of SELinux exports
  SELinux: setup new inode/ipc getsecid hooks
  LSM: Introduce inode_getsecid and ipc_getsecid hooks

1 files changed, 0 insertions, 25 deletions

diff --git a/kernel/audit.h b/kernel/audit.h
index 2554bd524fd1..3cfc54ee3e1f 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -65,34 +65,9 @@ struct audit_watch {
         struct list_head        rules;  /* associated rules */
 };
 
-struct audit_field {
-        u32                             type;
-        u32                             val;
-        u32                             op;
-        char                            *se_str;
-        struct selinux_audit_rule       *se_rule;
-};
-
 struct audit_tree;
 struct audit_chunk;
 
-struct audit_krule {
-        int                     vers_ops;
-        u32                     flags;
-        u32                     listnr;
-        u32                     action;
-        u32                     mask[AUDIT_BITMASK_SIZE];
-        u32                     buflen; /* for data alloc on list rules */
-        u32                     field_count;
-        char                    *filterkey; /* ties events to rules */
-        struct audit_field      *fields;
-        struct audit_field      *arch_f; /* quick access to arch field */
-        struct audit_field      *inode_f; /* quick access to an inode field */
-        struct audit_watch      *watch; /* associated watch */
-        struct audit_tree       *tree;  /* associated watched tree */
-        struct list_head        rlist;  /* entry in audit_{watch,tree}.rules list */
-};
-
 struct audit_entry {
         struct list_head        list;
         struct rcu_head         rcu;