3 files changed, 50 insertions, 1 deletions

diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index d003a6e16afb..328a20e880b5 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1732,3 +1732,40 @@ compat_sys_timerfd_gettime_wrapper:
         lgfr    %r2,%r2                 # int
         llgtr   %r3,%r3                 # struct compat_itimerspec *
         jg      compat_sys_timerfd_gettime
+
+        .globl compat_sys_signalfd4_wrapper
+compat_sys_signalfd4_wrapper:
+        lgfr    %r2,%r2                 # int
+        llgtr   %r3,%r3                 # compat_sigset_t *
+        llgfr   %r4,%r4                 # compat_size_t
+        lgfr    %r5,%r5                 # int
+        jg      compat_sys_signalfd4
+
+        .globl sys_eventfd2_wrapper
+sys_eventfd2_wrapper:
+        llgfr   %r2,%r2                 # unsigned int
+        lgfr    %r3,%r3                 # int
+        jg      sys_eventfd2
+
+        .globl  sys_inotify_init1_wrapper
+sys_inotify_init1_wrapper:
+        lgfr    %r2,%r2                 # int
+        jg      sys_inotify_init1
+
+        .globl  sys_pipe2_wrapper
+sys_pipe2_wrapper:
+        llgtr   %r2,%r2                 # u32 *
+        lgfr    %r3,%r3                 # int
+        jg      sys_pipe2               # branch to system call
+
+        .globl  sys_dup3_wrapper
+sys_dup3_wrapper:
+        llgfr   %r2,%r2                 # unsigned int
+        llgfr   %r3,%r3                 # unsigned int
+        lgfr    %r4,%r4                 # int
+        jg      sys_dup3                # branch to system call
+
+        .globl  sys_epoll_create1_wrapper
+sys_epoll_create1_wrapper:
+        lgfr    %r2,%r2                 # int
+        jg      sys_epoll_create1       # branch to system call
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index c87ec687d4c6..c66d35e55142 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -330,3 +330,9 @@ SYSCALL(sys_eventfd,sys_eventfd,sys_eventfd_wrapper)
 SYSCALL(sys_timerfd_create,sys_timerfd_create,sys_timerfd_create_wrapper)
 SYSCALL(sys_timerfd_settime,sys_timerfd_settime,compat_sys_timerfd_settime_wrapper) /* 320 */
 SYSCALL(sys_timerfd_gettime,sys_timerfd_gettime,compat_sys_timerfd_gettime_wrapper)
+SYSCALL(sys_signalfd4,sys_signalfd4,compat_sys_signalfd4_wrapper)
+SYSCALL(sys_eventfd2,sys_eventfd2,sys_eventfd2_wrapper)
+SYSCALL(sys_inotify_init1,sys_inotify_init1,sys_inotify_init1_wrapper)
+SYSCALL(sys_pipe2,sys_pipe2,sys_pipe2_wrapper) /* 325 */
+SYSCALL(sys_dup3,sys_dup3,sys_dup3_wrapper)
+SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper)
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index 583da807ea97..c8ad350d1444 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -259,7 +259,13 @@
 #define __NR_timerfd_create     319
 #define __NR_timerfd_settime    320
 #define __NR_timerfd_gettime    321
-#define NR_syscalls 322
+#define __NR_signalfd4          322
+#define __NR_eventfd2           323
+#define __NR_inotify_init1      324
+#define __NR_pipe2              325
+#define __NR_dup3               326
+#define __NR_epoll_create1      327
+#define NR_syscalls 328
 
 /* 
  * There are some system calls that are not present on 64 bit, some