Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6

This commit is contained in:
Linus Torvalds 2005-09-13 09:48:54 -07:00
commit ddbf9ef385
5 changed files with 424 additions and 159 deletions

View file

@ -1907,6 +1907,11 @@ extern int register_security (struct security_operations *ops);
extern int unregister_security (struct security_operations *ops);
extern int mod_reg_security (const char *name, struct security_operations *ops);
extern int mod_unreg_security (const char *name, struct security_operations *ops);
extern struct dentry *securityfs_create_file(const char *name, mode_t mode,
struct dentry *parent, void *data,
struct file_operations *fops);
extern struct dentry *securityfs_create_dir(const char *name, struct dentry *parent);
extern void securityfs_remove(struct dentry *dentry);
#else /* CONFIG_SECURITY */