Merge tag 'selinux-pr-20181115' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / security / selinux / hooks.c

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index fe251c6f09f104dcfdd70ee83c72c295f37b390a..a67459eb62d5c8d3066a72c354f13894f68be8ae 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4191,7 +4191,7 @@ static int selinux_task_movememory(struct task_struct *p)
                            PROCESS__SETSCHED, NULL);
 }
 
-static int selinux_task_kill(struct task_struct *p, struct siginfo *info,
+static int selinux_task_kill(struct task_struct *p, struct kernel_siginfo *info,
                                int sig, const struct cred *cred)
 {
        u32 secid;
@@ -7210,7 +7210,10 @@ void selinux_complete_init(void)
 
 /* SELinux requires early initialization in order to label
    all processes and objects when they are created. */
-security_initcall(selinux_init);
+DEFINE_LSM(selinux) = {
+       .name = "selinux",
+       .init = selinux_init,
+};
 
 #if defined(CONFIG_NETFILTER)