Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105928
b: refs/heads/master
c: bc64efd
h: refs/heads/master
v: v3
  • Loading branch information
Gustavo Fernando Padovan authored and Linus Torvalds committed Jul 25, 2008
1 parent 3cde35a commit ef67cdc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: d8878ba3f05ae5bbfad5a6e72e5121c0ea35f989
refs/heads/master: bc64efd220dcd4449aef8dd2564d73127b583b09
12 changes: 6 additions & 6 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ EXPORT_SYMBOL_GPL(kill_pid_info_as_uid);
* is probably wrong. Should make it like BSD or SYSV.
*/

static int kill_something_info(int sig, struct siginfo *info, int pid)
static int kill_something_info(int sig, struct siginfo *info, pid_t pid)
{
int ret;

Expand Down Expand Up @@ -2184,7 +2184,7 @@ sys_rt_sigtimedwait(const sigset_t __user *uthese,
}

asmlinkage long
sys_kill(int pid, int sig)
sys_kill(pid_t pid, int sig)
{
struct siginfo info;

Expand All @@ -2197,7 +2197,7 @@ sys_kill(int pid, int sig)
return kill_something_info(sig, &info, pid);
}

static int do_tkill(int tgid, int pid, int sig)
static int do_tkill(pid_t tgid, pid_t pid, int sig)
{
int error;
struct siginfo info;
Expand Down Expand Up @@ -2243,7 +2243,7 @@ static int do_tkill(int tgid, int pid, int sig)
* exists but it's not belonging to the target process anymore. This
* method solves the problem of threads exiting and PIDs getting reused.
*/
asmlinkage long sys_tgkill(int tgid, int pid, int sig)
asmlinkage long sys_tgkill(pid_t tgid, pid_t pid, int sig)
{
/* This is only valid for single tasks */
if (pid <= 0 || tgid <= 0)
Expand All @@ -2256,7 +2256,7 @@ asmlinkage long sys_tgkill(int tgid, int pid, int sig)
* Send a signal to only one task, even if it's a CLONE_THREAD task.
*/
asmlinkage long
sys_tkill(int pid, int sig)
sys_tkill(pid_t pid, int sig)
{
/* This is only valid for single tasks */
if (pid <= 0)
Expand All @@ -2266,7 +2266,7 @@ sys_tkill(int pid, int sig)
}

asmlinkage long
sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo)
sys_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t __user *uinfo)
{
siginfo_t info;

Expand Down

0 comments on commit ef67cdc

Please sign in to comment.