aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-12 03:53:02 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:32 -0500
commit27b0b2f44adffe0193a695bb528a83b550b8e54b (patch)
treefd7578afab2e9fa72e3f157f94c9dd73a8265678
parent9f57a54b6cf3f626334d97e93b5b917ad11e1efc (diff)
[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: Eric W. Biederman <ebiederm@xmission.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/sched.h3
-rw-r--r--kernel/signal.c27
2 files changed, 0 insertions, 30 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 39d40c518531..5053dc01fad4 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1329,14 +1329,11 @@ extern int kill_pid_info(int sig, struct siginfo *info, struct pid *pid);
1329extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_t, u32); 1329extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_t, u32);
1330extern int kill_pgrp(struct pid *pid, int sig, int priv); 1330extern int kill_pgrp(struct pid *pid, int sig, int priv);
1331extern int kill_pid(struct pid *pid, int sig, int priv); 1331extern int kill_pid(struct pid *pid, int sig, int priv);
1332extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
1333extern int kill_pg_info(int, struct siginfo *, pid_t);
1334extern void do_notify_parent(struct task_struct *, int); 1332extern void do_notify_parent(struct task_struct *, int);
1335extern void force_sig(int, struct task_struct *); 1333extern void force_sig(int, struct task_struct *);
1336extern void force_sig_specific(int, struct task_struct *); 1334extern void force_sig_specific(int, struct task_struct *);
1337extern int send_sig(int, struct task_struct *, int); 1335extern int send_sig(int, struct task_struct *, int);
1338extern void zap_other_threads(struct task_struct *p); 1336extern void zap_other_threads(struct task_struct *p);
1339extern int kill_pg(pid_t, int, int);
1340extern int kill_proc(pid_t, int, int); 1337extern int kill_proc(pid_t, int, int);
1341extern struct sigqueue *sigqueue_alloc(void); 1338extern struct sigqueue *sigqueue_alloc(void);
1342extern void sigqueue_free(struct sigqueue *); 1339extern void sigqueue_free(struct sigqueue *);
diff --git a/kernel/signal.c b/kernel/signal.c
index a9b679ed795c..8072e568bbe0 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1096,26 +1096,6 @@ int kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)
1096 return retval; 1096 return retval;
1097} 1097}
1098 1098
1099int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp)
1100{
1101 if (pgrp <= 0)
1102 return -EINVAL;
1103
1104 return __kill_pgrp_info(sig, info, find_pid(pgrp));
1105}
1106
1107int
1108kill_pg_info(int sig, struct siginfo *info, pid_t pgrp)
1109{
1110 int retval;
1111
1112 read_lock(&tasklist_lock);
1113 retval = __kill_pg_info(sig, info, pgrp);
1114 read_unlock(&tasklist_lock);
1115
1116 return retval;
1117}
1118
1119int kill_pid_info(int sig, struct siginfo *info, struct pid *pid) 1099int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
1120{ 1100{
1121 int error; 1101 int error;
@@ -1315,12 +1295,6 @@ int kill_pid(struct pid *pid, int sig, int priv)
1315EXPORT_SYMBOL(kill_pid); 1295EXPORT_SYMBOL(kill_pid);
1316 1296
1317int 1297int
1318kill_pg(pid_t pgrp, int sig, int priv)
1319{
1320 return kill_pg_info(sig, __si_special(priv), pgrp);
1321}
1322
1323int
1324kill_proc(pid_t pid, int sig, int priv) 1298kill_proc(pid_t pid, int sig, int priv)
1325{ 1299{
1326 return kill_proc_info(sig, __si_special(priv), pid); 1300 return kill_proc_info(sig, __si_special(priv), pid);
@@ -1959,7 +1933,6 @@ EXPORT_SYMBOL(recalc_sigpending);
1959EXPORT_SYMBOL_GPL(dequeue_signal); 1933EXPORT_SYMBOL_GPL(dequeue_signal);
1960EXPORT_SYMBOL(flush_signals); 1934EXPORT_SYMBOL(flush_signals);
1961EXPORT_SYMBOL(force_sig); 1935EXPORT_SYMBOL(force_sig);
1962EXPORT_SYMBOL(kill_pg);
1963EXPORT_SYMBOL(kill_proc); 1936EXPORT_SYMBOL(kill_proc);
1964EXPORT_SYMBOL(ptrace_notify); 1937EXPORT_SYMBOL(ptrace_notify);
1965EXPORT_SYMBOL(send_sig); 1938EXPORT_SYMBOL(send_sig);