diff --git a/[refs] b/[refs]
index 496270128926..4ad87ba8d537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c89e17e9c2bc03ed16320967832b33b174e6234
+refs/heads/master: 69d8e1389551b107b1a8ec70c280cb7a56096666
diff --git a/trunk/security/inode.c b/trunk/security/inode.c
index 9e42f5f705b2..dfc5978d4298 100644
--- a/trunk/security/inode.c
+++ b/trunk/security/inode.c
@@ -315,20 +315,19 @@ void securityfs_remove(struct dentry *dentry)
 }
 EXPORT_SYMBOL_GPL(securityfs_remove);
 
-static decl_subsys(security, NULL);
+static struct kobject *security_kobj;
 
 static int __init securityfs_init(void)
 {
 	int retval;
 
-	security_subsys.kobj.kset = &kernel_subsys;
-	retval = subsystem_register(&security_subsys);
-	if (retval)
-		return retval;
+	security_kobj = kobject_create_and_add("security", &kernel_subsys.kobj);
+	if (!security_kobj)
+		return -EINVAL;
 
 	retval = register_filesystem(&fs_type);
 	if (retval)
-		subsystem_unregister(&security_subsys);
+		kobject_unregister(security_kobj);
 	return retval;
 }