From e1c81eaaee2adcc9153feb9ef3abaee37a43dc32 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 18 Oct 2006 18:30:45 +0200 Subject: [PATCH] --- yaml --- r: 39862 b: refs/heads/master c: f5956f84072804712cb7b663c5c64e9800180833 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/syscalls.S | 1 + trunk/include/asm-s390/unistd.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 847ada742ea0..0fbb9b793a61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b42f5c20251060cb1ab875459fe66ad7bb92cbd +refs/heads/master: f5956f84072804712cb7b663c5c64e9800180833 diff --git a/trunk/arch/s390/kernel/syscalls.S b/trunk/arch/s390/kernel/syscalls.S index e59baec56520..a4ceae3dbcf1 100644 --- a/trunk/arch/s390/kernel/syscalls.S +++ b/trunk/arch/s390/kernel/syscalls.S @@ -320,3 +320,4 @@ SYSCALL(sys_tee,sys_tee,sys_tee_wrapper) SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper) NI_SYSCALL /* 310 sys_move_pages */ SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper) +SYSCALL(sys_epoll_pwait,sys_epoll_pwait,sys_ni_syscall) diff --git a/trunk/include/asm-s390/unistd.h b/trunk/include/asm-s390/unistd.h index a19238cbcffa..71d3c21b84f0 100644 --- a/trunk/include/asm-s390/unistd.h +++ b/trunk/include/asm-s390/unistd.h @@ -249,8 +249,9 @@ #define __NR_vmsplice 309 /* Number 310 is reserved for new sys_move_pages */ #define __NR_getcpu 311 +#define __NR_epoll_pwait 312 -#define NR_syscalls 312 +#define NR_syscalls 313 /* * There are some system calls that are not present on 64 bit, some