aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2010-05-13 23:01:26 -0400
committerJames Morris <jmorris@namei.org>2010-05-16 19:27:20 -0400
commitc80901f2755c582e3096e6708028a8daca59e6e2 (patch)
treeeaf353e1736d7f7f99f04b4c086e4bbbff4af854 /security
parent7762fbfffdbce8191f5236d5053b290035d3d749 (diff)
LSM: Add __init to fixup function.
register_security() became __init function. So do verify() and security_fixup_ops(). Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/capability.c2
-rw-r--r--security/security.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/security/capability.c b/security/capability.c
index 7f093d573ede..8168e3ecd5bf 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -854,7 +854,7 @@ static void cap_audit_rule_free(void *lsmrule)
854 } \ 854 } \
855 } while (0) 855 } while (0)
856 856
857void security_fixup_ops(struct security_operations *ops) 857void __init security_fixup_ops(struct security_operations *ops)
858{ 858{
859 set_to_cap_if_null(ops, ptrace_access_check); 859 set_to_cap_if_null(ops, ptrace_access_check);
860 set_to_cap_if_null(ops, ptrace_traceme); 860 set_to_cap_if_null(ops, ptrace_traceme);
diff --git a/security/security.c b/security/security.c
index 8585019a1a59..351942a4ca0e 100644
--- a/security/security.c
+++ b/security/security.c
@@ -23,14 +23,14 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
23 CONFIG_DEFAULT_SECURITY; 23 CONFIG_DEFAULT_SECURITY;
24 24
25/* things that live in capability.c */ 25/* things that live in capability.c */
26extern void security_fixup_ops(struct security_operations *ops); 26extern void __init security_fixup_ops(struct security_operations *ops);
27 27
28static struct security_operations *security_ops; 28static struct security_operations *security_ops;
29static struct security_operations default_security_ops = { 29static struct security_operations default_security_ops = {
30 .name = "default", 30 .name = "default",
31}; 31};
32 32
33static inline int verify(struct security_operations *ops) 33static inline int __init verify(struct security_operations *ops)
34{ 34{
35 /* verify the security_operations structure exists */ 35 /* verify the security_operations structure exists */
36 if (!ops) 36 if (!ops)