Merge tag 'clk-for-linus-3.20' of git://git.linaro.org/people/mike.turquette/linux

[deliverable/linux.git] / include / linux / audit.h

diff --git a/include/linux/audit.h b/include/linux/audit.h
index af84234e1f6e2f3741ccb42f1a89e325f17749e8..c2e7e3a83965341207b64dab360a72b9cce780a6 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -46,7 +46,6 @@ struct audit_tree;
 struct sk_buff;
 
 struct audit_krule {
-       int                     vers_ops;
        u32                     pflags;
        u32                     flags;
        u32                     listnr;
@@ -128,7 +127,6 @@ extern void __audit_syscall_entry(int major, unsigned long a0, unsigned long a1,
 extern void __audit_syscall_exit(int ret_success, long ret_value);
 extern struct filename *__audit_reusename(const __user char *uptr);
 extern void __audit_getname(struct filename *name);
-extern void audit_putname(struct filename *name);
 
 #define AUDIT_INODE_PARENT     1       /* dentry represents the parent */
 #define AUDIT_INODE_HIDDEN     2       /* audit record should be hidden */
@@ -353,8 +351,6 @@ static inline struct filename *audit_reusename(const __user char *name)
 }
 static inline void audit_getname(struct filename *name)
 { }
-static inline void audit_putname(struct filename *name)
-{ }
 static inline void __audit_inode(struct filename *name,
                                        const struct dentry *dentry,
                                        unsigned int flags)