mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Get rid of the kill_pgrp_info() function
There's only one caller left - the kill_pgrp one - so merge these two functions and forget the kill_pgrp_info one. Signed-off-by: Pavel Emelyanov <[email protected]> Reviewed-by: Oleg Nesterov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
d5df763b81
commit
146a505d49
2 changed files with 8 additions and 14 deletions
|
|
@ -1018,7 +1018,7 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
|
|||
}
|
||||
|
||||
/*
|
||||
* kill_pgrp_info() sends a signal to a process group: this is what the tty
|
||||
* __kill_pgrp_info() sends a signal to a process group: this is what the tty
|
||||
* control characters do (^C, ^Z etc)
|
||||
*/
|
||||
|
||||
|
|
@ -1037,17 +1037,6 @@ int __kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)
|
|||
return success ? 0 : retval;
|
||||
}
|
||||
|
||||
int kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)
|
||||
{
|
||||
int retval;
|
||||
|
||||
read_lock(&tasklist_lock);
|
||||
retval = __kill_pgrp_info(sig, info, pgrp);
|
||||
read_unlock(&tasklist_lock);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
|
||||
{
|
||||
int error = -ESRCH;
|
||||
|
|
@ -1236,7 +1225,13 @@ force_sigsegv(int sig, struct task_struct *p)
|
|||
|
||||
int kill_pgrp(struct pid *pid, int sig, int priv)
|
||||
{
|
||||
return kill_pgrp_info(sig, __si_special(priv), pid);
|
||||
int ret;
|
||||
|
||||
read_lock(&tasklist_lock);
|
||||
ret = __kill_pgrp_info(sig, __si_special(priv), pid);
|
||||
read_unlock(&tasklist_lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(kill_pgrp);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue