aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 {
1660extern int security_init(void); 1660extern int security_init(void);
1661extern int security_module_enable(struct security_operations *ops); 1661extern int security_module_enable(struct security_operations *ops);
1662extern int register_security(struct security_operations *ops); 1662extern int register_security(struct security_operations *ops);
1663extern void __init security_fixup_ops(struct security_operations *ops);
1664
1663 1665
1664/* Security operations */ 1666/* Security operations */
1665int security_ptrace_access_check(struct task_struct *child, unsigned int mode); 1667int 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 @@
26static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = 26static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
27 CONFIG_DEFAULT_SECURITY; 27 CONFIG_DEFAULT_SECURITY;
28 28
29/* things that live in capability.c */
30extern void __init security_fixup_ops(struct security_operations *ops);
31
32static struct security_operations *security_ops; 29static struct security_operations *security_ops;
33static struct security_operations default_security_ops = { 30static struct security_operations default_security_ops = {
34 .name = "default", 31 .name = "default",