aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/security.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 12:48:54 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 12:48:54 -0400
commitddbf9ef385bfbef897210733abfb73cb9b94ecec (patch)
tree64a9e965a71eef13e813a3327f8d74aa7168ee19 /include/linux/security.h
parent5d54e69c68c05b162a56f9914cae72afd7e6f40a (diff)
parent2c40579bdc2a94977fcff2521d5b53a97c33e77a (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
Diffstat (limited to 'include/linux/security.h')
-rw-r--r--include/linux/security.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 55b02e1c73f4..0e43460d374e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1907,6 +1907,11 @@ extern int register_security (struct security_operations *ops);
1907extern int unregister_security (struct security_operations *ops); 1907extern int unregister_security (struct security_operations *ops);
1908extern int mod_reg_security (const char *name, struct security_operations *ops); 1908extern int mod_reg_security (const char *name, struct security_operations *ops);
1909extern int mod_unreg_security (const char *name, struct security_operations *ops); 1909extern int mod_unreg_security (const char *name, struct security_operations *ops);
1910extern struct dentry *securityfs_create_file(const char *name, mode_t mode,
1911 struct dentry *parent, void *data,
1912 struct file_operations *fops);
1913extern struct dentry *securityfs_create_dir(const char *name, struct dentry *parent);
1914extern void securityfs_remove(struct dentry *dentry);
1910 1915
1911 1916
1912#else /* CONFIG_SECURITY */ 1917#else /* CONFIG_SECURITY */