path: root/include
diff options
authorChris Metcalf <cmetcalf@tilera.com>2010-06-25 14:54:16 -0400
committerChris Metcalf <cmetcalf@tilera.com>2010-06-25 14:54:16 -0400
commitb51cae21ee66f77a368428e6bdf75a0c012c9fd7 (patch)
treefc0a399f7ab10f7a799fdc8e7829b79033e7ae6e /include
parent9c78965ca18594fe0a34a1a1b13781b10f85e4bc (diff)
Add wait4() back to the set of <asm-generic/unistd.h> syscalls.
The initial pass at the generic ABI assumed that wait4() could be easily expressed using waitid(). Although it's true that wait4() can be built on waitid(), it's awkward enough that it makes more sense to continue to include wait4 in the generic syscall ABI. Since there is already a deprecated wait4 in the ABI, this change converts that wait4 into old_wait, and puts wait4 in the next available slot for new supported syscalls, after the platform-specific syscalls at number 260. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index 30218b4fa4e..c17cebc4995 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -638,8 +638,11 @@ __SYSCALL(__NR_recvmmsg, sys_recvmmsg)
#define __NR_arch_specific_syscall 244
+#define __NR_wait4 260
+__SYSCALL(__NR_wait4, sys_wait4)
#undef __NR_syscalls
-#define __NR_syscalls 260
+#define __NR_syscalls 261
* All syscalls below here should go away really,
@@ -776,8 +779,8 @@ __SYSCALL(__NR_epoll_wait, sys_epoll_wait)
__SYSCALL(__NR_ustat, sys_ustat)
#define __NR_vfork 1071
__SYSCALL(__NR_vfork, sys_vfork)
-#define __NR_wait4 1072
-__SYSCALL(__NR_wait4, sys_wait4)
+#define __NR_oldwait4 1072
+__SYSCALL(__NR_oldwait4, sys_wait4)
#define __NR_recv 1073
__SYSCALL(__NR_recv, sys_recv)
#define __NR_send 1074