From e4b49d495777cb1bc736b9188326ed2b485631bd Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Fri, 25 Jun 2010 14:54:16 -0400 Subject: [PATCH] --- yaml --- r: 207168 b: refs/heads/master c: b51cae21ee66f77a368428e6bdf75a0c012c9fd7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/unistd.h | 9 ++++++--- trunk/scripts/checksyscalls.sh | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e87bd16d2213..a8a78085f270 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c78965ca18594fe0a34a1a1b13781b10f85e4bc +refs/heads/master: b51cae21ee66f77a368428e6bdf75a0c012c9fd7 diff --git a/trunk/include/asm-generic/unistd.h b/trunk/include/asm-generic/unistd.h index 30218b4fa4e0..c17cebc49952 100644 --- a/trunk/include/asm-generic/unistd.h +++ b/trunk/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 diff --git a/trunk/scripts/checksyscalls.sh b/trunk/scripts/checksyscalls.sh index 66ad375612f2..6bb42e72e0e5 100755 --- a/trunk/scripts/checksyscalls.sh +++ b/trunk/scripts/checksyscalls.sh @@ -183,7 +183,6 @@ cat << EOF #define __IGNORE_ustat /* statfs */ #define __IGNORE_utime /* utimes */ #define __IGNORE_vfork /* clone */ -#define __IGNORE_wait4 /* waitid */ /* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */ #ifdef __NR_sync_file_range2