Commit 27b0b2f4 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

[PATCH] pid: remove the now unused kill_pg kill_pg_info and __kill_pg_info

Now that I have changed all of the in-tree users remove the old version of
these functions.  This should make it clear to any out of tree users that they
should be using kill_pgrp kill_pgrp_info or __kill_pgrp_info instead.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9f57a54b
...@@ -1329,14 +1329,11 @@ extern int kill_pid_info(int sig, struct siginfo *info, struct pid *pid); ...@@ -1329,14 +1329,11 @@ extern int kill_pid_info(int sig, struct siginfo *info, struct pid *pid);
extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_t, u32); extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_t, u32);
extern int kill_pgrp(struct pid *pid, int sig, int priv); extern int kill_pgrp(struct pid *pid, int sig, int priv);
extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_pid(struct pid *pid, int sig, int priv);
extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
extern int kill_pg_info(int, struct siginfo *, pid_t);
extern void do_notify_parent(struct task_struct *, int); extern void do_notify_parent(struct task_struct *, int);
extern void force_sig(int, struct task_struct *); extern void force_sig(int, struct task_struct *);
extern void force_sig_specific(int, struct task_struct *); extern void force_sig_specific(int, struct task_struct *);
extern int send_sig(int, struct task_struct *, int); extern int send_sig(int, struct task_struct *, int);
extern void zap_other_threads(struct task_struct *p); extern void zap_other_threads(struct task_struct *p);
extern int kill_pg(pid_t, int, int);
extern int kill_proc(pid_t, int, int); extern int kill_proc(pid_t, int, int);
extern struct sigqueue *sigqueue_alloc(void); extern struct sigqueue *sigqueue_alloc(void);
extern void sigqueue_free(struct sigqueue *); extern void sigqueue_free(struct sigqueue *);
......
...@@ -1096,26 +1096,6 @@ int kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp) ...@@ -1096,26 +1096,6 @@ int kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)
return retval; return retval;
} }
int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp)
{
if (pgrp <= 0)
return -EINVAL;
return __kill_pgrp_info(sig, info, find_pid(pgrp));
}
int
kill_pg_info(int sig, struct siginfo *info, pid_t pgrp)
{
int retval;
read_lock(&tasklist_lock);
retval = __kill_pg_info(sig, info, pgrp);
read_unlock(&tasklist_lock);
return retval;
}
int kill_pid_info(int sig, struct siginfo *info, struct pid *pid) int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
{ {
int error; int error;
...@@ -1314,12 +1294,6 @@ int kill_pid(struct pid *pid, int sig, int priv) ...@@ -1314,12 +1294,6 @@ int kill_pid(struct pid *pid, int sig, int priv)
} }
EXPORT_SYMBOL(kill_pid); EXPORT_SYMBOL(kill_pid);
int
kill_pg(pid_t pgrp, int sig, int priv)
{
return kill_pg_info(sig, __si_special(priv), pgrp);
}
int int
kill_proc(pid_t pid, int sig, int priv) kill_proc(pid_t pid, int sig, int priv)
{ {
...@@ -1959,7 +1933,6 @@ EXPORT_SYMBOL(recalc_sigpending); ...@@ -1959,7 +1933,6 @@ EXPORT_SYMBOL(recalc_sigpending);
EXPORT_SYMBOL_GPL(dequeue_signal); EXPORT_SYMBOL_GPL(dequeue_signal);
EXPORT_SYMBOL(flush_signals); EXPORT_SYMBOL(flush_signals);
EXPORT_SYMBOL(force_sig); EXPORT_SYMBOL(force_sig);
EXPORT_SYMBOL(kill_pg);
EXPORT_SYMBOL(kill_proc); EXPORT_SYMBOL(kill_proc);
EXPORT_SYMBOL(ptrace_notify); EXPORT_SYMBOL(ptrace_notify);
EXPORT_SYMBOL(send_sig); EXPORT_SYMBOL(send_sig);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment