---

yaml --- r: 192453 b: refs/heads/master c: c80901f h: refs/heads/master i: 192451: 4001829 v: v3
git-mirror · May 16, 2010 · 90d469b · 90d469b
1 parent c8f2544
commit 90d469b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7762fbfffdbce8191f5236d5053b290035d3d749
+refs/heads/master: c80901f2755c582e3096e6708028a8daca59e6e2
diff --git a/trunk/security/capability.c b/trunk/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);

diff --git a/trunk/security/security.c b/trunk/security/security.c
@@ -23,14 +23,14 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
 	CONFIG_DEFAULT_SECURITY;
 
 /* things that live in capability.c */
-extern void security_fixup_ops(struct security_operations *ops);
+extern void __init security_fixup_ops(struct security_operations *ops);
 
 static struct security_operations *security_ops;
 static struct security_operations default_security_ops = {
 	.name	= "default",
 };
 
-static inline int verify(struct security_operations *ops)
+static inline int __init verify(struct security_operations *ops)
 {
 	/* verify the security_operations structure exists */
 	if (!ops)