Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[safe/jmp/linux-2.6] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 7f093d5..8168e3e 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -854,7 +854,7 @@ static void cap_audit_rule_free(void *lsmrule)
                        }                                               \
        } while (0)
 
-void security_fixup_ops(struct security_operations *ops)
+void __init security_fixup_ops(struct security_operations *ops)
 {
        set_to_cap_if_null(ops, ptrace_access_check);
        set_to_cap_if_null(ops, ptrace_traceme);