summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-08-30 13:48:53 +1000
committerJames Morris <jmorris@namei.org>2011-09-09 16:56:33 -0700
commit5dbe3040c74eef18e66951347eda05b153e69328 (patch)
tree72c9e5f77deae00f1234e488254d4898cab32027
parent7b98a5857c3fa86cb0a7e5f893643491a8b5b425 (diff)
security: sparse fix: Move security_fixup_op to security.h
Fix sparse warning by moving declaraion to global header. Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/security.h2
-rw-r--r--security/security.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index a14c2d4b22cf..19d8e04e1688 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1660,6 +1660,8 @@ struct security_operations {
extern int security_init(void);
extern int security_module_enable(struct security_operations *ops);
extern int register_security(struct security_operations *ops);
+extern void __init security_fixup_ops(struct security_operations *ops);
+
/* Security operations */
int security_ptrace_access_check(struct task_struct *child, unsigned int mode);
diff --git a/security/security.c b/security/security.c
index a6328421a055..9ebda054a333 100644
--- a/security/security.c
+++ b/security/security.c
@@ -26,9 +26,6 @@
static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
CONFIG_DEFAULT_SECURITY;
-/* things that live in capability.c */
-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",