aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2010-05-14 12:01:26 +0900
committerJames Morris <jmorris@namei.org>2010-05-17 09:27:20 +1000
commitc80901f2755c582e3096e6708028a8daca59e6e2 (patch)
treeeaf353e1736d7f7f99f04b4c086e4bbbff4af854 /security
parent7762fbfffdbce8191f5236d5053b290035d3d749 (diff)
downloadlinux-2.6.34-ux500-c80901f2755c582e3096e6708028a8daca59e6e2.tar.gz
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 7f093d573ed..8168e3ecd5b 100644
--- 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);
diff --git a/security/security.c b/security/security.c
index 8585019a1a5..351942a4ca0 100644
--- a/security/security.c
+++ b/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)