Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index d7ecf89fbc743435dc8e82cb424c1b9803984700..b28a8acae34d7082dcb52519f1ebb927a2e1c9ae 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -321,7 +321,7 @@ static int __init securityfs_init(void)
 {
        int retval;
 
-       kset_set_kset_s(&security_subsys, kernel_subsys);
+       kobj_set_kset_s(&security_subsys, kernel_subsys);
        retval = subsystem_register(&security_subsys);
        if (retval)
                return retval;
@@ -332,14 +332,6 @@ static int __init securityfs_init(void)
        return retval;
 }
 
-static void __exit securityfs_exit(void)
-{
-       simple_release_fs(&mount, &mount_count);
-       unregister_filesystem(&fs_type);
-       subsystem_unregister(&security_subsys);
-}
-
 core_initcall(securityfs_init);
-module_exit(securityfs_exit);
 MODULE_LICENSE("GPL");