eventpoll: wire up epoll_pwait3() syscall

This adds the generic definition and wires it up for x86 and arm.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index ac964612d8b0781f21891cd09a95955de0215288..2f247aeb4430b14dbd225f63830ce1ef50809199 100644 (file)
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -464,3 +464,4 @@
 448    common  process_mrelease                sys_process_mrelease
 449    common  futex_waitv                     sys_futex_waitv
 450    common  set_mempolicy_home_node         sys_set_mempolicy_home_node
+451    common  epoll_pwait3                    sys_epoll_pwait3

diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 320480a8db4f834dfee790b9a41e5516a88674f6..8fdcd3c9554c684c9be8582d4c12a3b3d4a3ba5d 100644 (file)
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -455,3 +455,4 @@
 448    i386    process_mrelease        sys_process_mrelease
 449    i386    futex_waitv             sys_futex_waitv
 450    i386    set_mempolicy_home_node         sys_set_mempolicy_home_node
+451    i386    epoll_pwait3            sys_epoll_pwait3

diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl
index c84d12608cd2de9e45f6cc166169cf70ecbf7518..6e3aaa27cf1a27a431c29ef12b8e89bb8e9b479c 100644 (file)
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@ -372,6 +372,7 @@
 448    common  process_mrelease        sys_process_mrelease
 449    common  futex_waitv             sys_futex_waitv
 450    common  set_mempolicy_home_node sys_set_mempolicy_home_node
+451    common  epoll_pwait3            sys_epoll_pwait3
 
 #
 # Due to a historical design error, certain syscalls are numbered differently

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 33a0ee3bcb2ed9b4ac9db5d65c1ab4bc99750a87..3648922b5751671e96f8b798e9536c6b78cdf570 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -393,6 +393,9 @@ asmlinkage long sys_epoll_pwait2(int epfd, struct epoll_event __user *events,
                                 const struct __kernel_timespec __user *timeout,
                                 const sigset_t __user *sigmask,
                                 size_t sigsetsize);
+asmlinkage long sys_epoll_pwait3(int epfd, struct epoll_event __user *events,
+                                int maxevents, int flags,
+                                struct epoll_pwait_data __user *data);
 
 /* fs/fcntl.c */
 asmlinkage long sys_dup(unsigned int fildes);

diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 45fa180cc56adf335ebfa7c2c6bf85b9704e25fa..284b0198f3fb660a1f11f5c3ba07d0a8495e293e 100644 (file)
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -886,8 +886,11 @@ __SYSCALL(__NR_futex_waitv, sys_futex_waitv)
 #define __NR_set_mempolicy_home_node 450
 __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node)
 
+#define __NR_epoll_pwait3 451
+__SYSCALL(__NR_epoll_pwait3, sys_epoll_pwait3)
+
 #undef __NR_syscalls
-#define __NR_syscalls 451
+#define __NR_syscalls 452
 
 /*
  * 32 bit systems traditionally used different