Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[sfrench/cifs-2.6.git] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index d7ecf89fbc743435dc8e82cb424c1b9803984700..307211ac73461d3d86e1e2830c3257872041f637 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;