Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h

1 files changed, 9 insertions, 8 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index cbdb39a498eb..29f4b790751c 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1140,7 +1140,7 @@ NORET_TYPE void complete_and_exit(struct completion *comp, long code)
 
 EXPORT_SYMBOL(complete_and_exit);
 
-asmlinkage long sys_exit(int error_code)
+SYSCALL_DEFINE1(exit, int, error_code)
 {
         do_exit((error_code&0xff)<<8);
 }
@@ -1181,9 +1181,11 @@ 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.
  */
-asmlinkage void sys_exit_group(int error_code)
+SYSCALL_DEFINE1(exit_group, int, error_code)
 {
         do_group_exit((error_code & 0xff) << 8);
+        /* NOTREACHED */
+        return 0;
 }
 
 static struct pid *task_pid_type(struct task_struct *task, enum pid_type type)
@@ -1757,9 +1759,8 @@ end:
         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;
@@ -1798,8 +1799,8 @@ asmlinkage long sys_waitid(int which, pid_t upid,
         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;
@@ -1836,7 +1837,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.
  */
-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);
 }