git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove final fastcall users
[safe/jmp/linux-2.6]
/
kernel
/
signal.c
diff --git
a/kernel/signal.c
b/kernel/signal.c
index
a805c74
..
84917fe
100644
(file)
--- a/
kernel/signal.c
+++ b/
kernel/signal.c
@@
-972,7
+972,7
@@
void zap_other_threads(struct task_struct *p)
}
}
}
}
-int
fastcall
__fatal_signal_pending(struct task_struct *tsk)
+int __fatal_signal_pending(struct task_struct *tsk)
{
return sigismember(&tsk->pending.signal, SIGKILL);
}
{
return sigismember(&tsk->pending.signal, SIGKILL);
}
@@
-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)
*/
* 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;
}
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;
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)
{
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);
}
EXPORT_SYMBOL(kill_pgrp);