aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--security/inode.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/security/inode.c b/security/inode.c
index 9e42f5f705b2..dfc5978d4298 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -315,20 +315,19 @@ void securityfs_remove(struct dentry *dentry)
315} 315}
316EXPORT_SYMBOL_GPL(securityfs_remove); 316EXPORT_SYMBOL_GPL(securityfs_remove);
317 317
318static decl_subsys(security, NULL); 318static struct kobject *security_kobj;
319 319
320static int __init securityfs_init(void) 320static int __init securityfs_init(void)
321{ 321{
322 int retval; 322 int retval;
323 323
324 security_subsys.kobj.kset = &kernel_subsys; 324 security_kobj = kobject_create_and_add("security", &kernel_subsys.kobj);
325 retval = subsystem_register(&security_subsys); 325 if (!security_kobj)
326 if (retval) 326 return -EINVAL;
327 return retval;
328 327
329 retval = register_filesystem(&fs_type); 328 retval = register_filesystem(&fs_type);
330 if (retval) 329 if (retval)
331 subsystem_unregister(&security_subsys); 330 kobject_unregister(security_kobj);
332 return retval; 331 return retval;
333} 332}
334 333