Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[muen/linux.git] / kernel / signal.c
index 47491aa..d4ccea5 100644 (file)
@@ -770,7 +770,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
                }
        }
 
-       return security_task_kill(t, info, sig, 0);
+       return security_task_kill(t, info, sig, NULL);
 }
 
 /**
@@ -1361,7 +1361,7 @@ static int kill_as_cred_perm(const struct cred *cred,
 
 /* like kill_pid_info(), but doesn't use uid/euid of "current" */
 int kill_pid_info_as_cred(int sig, struct siginfo *info, struct pid *pid,
-                        const struct cred *cred, u32 secid)
+                        const struct cred *cred)
 {
        int ret = -EINVAL;
        struct task_struct *p;
@@ -1380,7 +1380,7 @@ int kill_pid_info_as_cred(int sig, struct siginfo *info, struct pid *pid,
                ret = -EPERM;
                goto out_unlock;
        }
-       ret = security_task_kill(p, info, sig, secid);
+       ret = security_task_kill(p, info, sig, cred);
        if (ret)
                goto out_unlock;