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
Btrfs: hash_lock is no longer needed
[safe/jmp/linux-2.6]
/
kernel
/
exit.c
diff --git
a/kernel/exit.c
b/kernel/exit.c
index
fac9b04
..
f80dec3
100644
(file)
--- a/
kernel/exit.c
+++ b/
kernel/exit.c
@@
-1141,7
+1141,7
@@
NORET_TYPE void complete_and_exit(struct completion *comp, long code)
EXPORT_SYMBOL(complete_and_exit);
EXPORT_SYMBOL(complete_and_exit);
-
asmlinkage long sys_exit(int
error_code)
+
SYSCALL_DEFINE1(exit, int,
error_code)
{
do_exit((error_code&0xff)<<8);
}
{
do_exit((error_code&0xff)<<8);
}
@@
-1182,7
+1182,7
@@
do_group_exit(int exit_code)
* wait4()-ing process will get the correct exit code - even if this
* thread is not the thread group leader.
*/
* wait4()-ing process will get the correct exit code - even if this
* thread is not the thread group leader.
*/
-
asmlinkage long sys_exit_group(int
error_code)
+
SYSCALL_DEFINE1(exit_group, int,
error_code)
{
do_group_exit((error_code & 0xff) << 8);
/* NOTREACHED */
{
do_group_exit((error_code & 0xff) << 8);
/* NOTREACHED */
@@
-1754,9
+1754,8
@@
end:
return retval;
}
return retval;
}
-asmlinkage long sys_waitid(int which, pid_t upid,
- struct siginfo __user *infop, int options,
- struct rusage __user *ru)
+SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
+ infop, int, options, struct rusage __user *, ru)
{
struct pid *pid = NULL;
enum pid_type type;
{
struct pid *pid = NULL;
enum pid_type type;
@@
-1795,8
+1794,8
@@
asmlinkage long sys_waitid(int which, pid_t upid,
return ret;
}
return ret;
}
-
asmlinkage long sys_wait4(pid_t upid, int __user *
stat_addr,
-
int options, struct rusage __user *
ru)
+
SYSCALL_DEFINE4(wait4, pid_t, upid, int __user *,
stat_addr,
+
int, options, struct rusage __user *,
ru)
{
struct pid *pid = NULL;
enum pid_type type;
{
struct pid *pid = NULL;
enum pid_type type;
@@
-1833,7
+1832,7
@@
asmlinkage long sys_wait4(pid_t upid, int __user *stat_addr,
* sys_waitpid() remains for compatibility. waitpid() should be
* implemented by calling sys_wait4() from libc.a.
*/
* sys_waitpid() remains for compatibility. waitpid() should be
* implemented by calling sys_wait4() from libc.a.
*/
-
asmlinkage long sys_waitpid(pid_t pid, int __user *stat_addr, int
options)
+
SYSCALL_DEFINE3(waitpid, pid_t, pid, int __user *, stat_addr, int,
options)
{
return sys_wait4(pid, stat_addr, options, NULL);
}
{
return sys_wait4(pid, stat_addr, options, NULL);
}