Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47948
b: refs/heads/master
c: 27b0b2f
h: refs/heads/master
v: v3
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Feb 12, 2007
1 parent 12661a9 commit 16e1805
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f57a54b6cf3f626334d97e93b5b917ad11e1efc
refs/heads/master: 27b0b2f44adffe0193a695bb528a83b550b8e54b
3 changes: 0 additions & 3 deletions trunk/include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_pgrp(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 force_sig(int, struct task_struct *);
extern void force_sig_specific(int, struct task_struct *);
extern int send_sig(int, struct task_struct *, int);
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 struct sigqueue *sigqueue_alloc(void);
extern void sigqueue_free(struct sigqueue *);
Expand Down
27 changes: 0 additions & 27 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1096,26 +1096,6 @@ int kill_pgrp_info(int sig, struct siginfo *info, struct pid *pgrp)
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 error;
Expand Down Expand Up @@ -1314,12 +1294,6 @@ int kill_pid(struct pid *pid, int sig, int priv)
}
EXPORT_SYMBOL(kill_pid);

int
kill_pg(pid_t pgrp, int sig, int priv)
{
return kill_pg_info(sig, __si_special(priv), pgrp);
}

int
kill_proc(pid_t pid, int sig, int priv)
{
Expand Down Expand Up @@ -1959,7 +1933,6 @@ EXPORT_SYMBOL(recalc_sigpending);
EXPORT_SYMBOL_GPL(dequeue_signal);
EXPORT_SYMBOL(flush_signals);
EXPORT_SYMBOL(force_sig);
EXPORT_SYMBOL(kill_pg);
EXPORT_SYMBOL(kill_proc);
EXPORT_SYMBOL(ptrace_notify);
EXPORT_SYMBOL(send_sig);
Expand Down

0 comments on commit 16e1805

Please sign in to comment.