diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-25 04:48:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:45 -0400 |
commit | 19b0cfcca41dd772065671ad0584e1cea0f3fd13 (patch) | |
tree | 6a8a627e2e2f3f26b02fc4228517c421e66a8043 | |
parent | 33166b1ffca5e1945246bcaa77d72a22b0d3e531 (diff) |
pidns: remove now unused kill_proc function
This function operated on a pid_t to kill a task, which is no longer valid
in a containerized system.
It has finally lost all its users and we can safely remove it from the
tree.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | kernel/signal.c | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 0560999eb1db..134cb5cb506c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1800,7 +1800,6 @@ extern void force_sig(int, struct task_struct *); | |||
1800 | extern void force_sig_specific(int, struct task_struct *); | 1800 | extern void force_sig_specific(int, struct task_struct *); |
1801 | extern int send_sig(int, struct task_struct *, int); | 1801 | extern int send_sig(int, struct task_struct *, int); |
1802 | extern void zap_other_threads(struct task_struct *p); | 1802 | extern void zap_other_threads(struct task_struct *p); |
1803 | extern int kill_proc(pid_t, int, int); | ||
1804 | extern struct sigqueue *sigqueue_alloc(void); | 1803 | extern struct sigqueue *sigqueue_alloc(void); |
1805 | extern void sigqueue_free(struct sigqueue *); | 1804 | extern void sigqueue_free(struct sigqueue *); |
1806 | extern int send_sigqueue(struct sigqueue *, struct task_struct *, int group); | 1805 | extern int send_sigqueue(struct sigqueue *, struct task_struct *, int group); |
diff --git a/kernel/signal.c b/kernel/signal.c index 5c7b7eaa0dc6..82c3545596c5 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1228,17 +1228,6 @@ int kill_pid(struct pid *pid, int sig, int priv) | |||
1228 | } | 1228 | } |
1229 | EXPORT_SYMBOL(kill_pid); | 1229 | EXPORT_SYMBOL(kill_pid); |
1230 | 1230 | ||
1231 | int | ||
1232 | kill_proc(pid_t pid, int sig, int priv) | ||
1233 | { | ||
1234 | int ret; | ||
1235 | |||
1236 | rcu_read_lock(); | ||
1237 | ret = kill_pid_info(sig, __si_special(priv), find_pid(pid)); | ||
1238 | rcu_read_unlock(); | ||
1239 | return ret; | ||
1240 | } | ||
1241 | |||
1242 | /* | 1231 | /* |
1243 | * These functions support sending signals using preallocated sigqueue | 1232 | * These functions support sending signals using preallocated sigqueue |
1244 | * structures. This is needed "because realtime applications cannot | 1233 | * structures. This is needed "because realtime applications cannot |
@@ -1906,7 +1895,6 @@ EXPORT_SYMBOL(recalc_sigpending); | |||
1906 | EXPORT_SYMBOL_GPL(dequeue_signal); | 1895 | EXPORT_SYMBOL_GPL(dequeue_signal); |
1907 | EXPORT_SYMBOL(flush_signals); | 1896 | EXPORT_SYMBOL(flush_signals); |
1908 | EXPORT_SYMBOL(force_sig); | 1897 | EXPORT_SYMBOL(force_sig); |
1909 | EXPORT_SYMBOL(kill_proc); | ||
1910 | EXPORT_SYMBOL(ptrace_notify); | 1898 | EXPORT_SYMBOL(ptrace_notify); |
1911 | EXPORT_SYMBOL(send_sig); | 1899 | EXPORT_SYMBOL(send_sig); |
1912 | EXPORT_SYMBOL(send_sig_info); | 1900 | EXPORT_SYMBOL(send_sig_info); |