4 files changed, 36 insertions, 3 deletions

diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 32a69a18a796..acc415457b45 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1682,3 +1682,31 @@ compat_sys_utimes_wrapper:
         llgtr   %r2,%r2                 # char *
         llgtr   %r3,%r3                 # struct compat_timeval *
         jg      compat_sys_utimes
+
+        .globl  compat_sys_utimensat_wrapper
+compat_sys_utimensat_wrapper:
+        llgfr   %r2,%r2                 # unsigned int
+        llgtr   %r3,%r3                 # char *
+        llgtr   %r4,%r4                 # struct compat_timespec *
+        lgfr    %r5,%r5                 # int
+        jg      compat_sys_utimensat
+
+        .globl  compat_sys_signalfd_wrapper
+compat_sys_signalfd_wrapper:
+        lgfr    %r2,%r2                 # int
+        llgtr   %r3,%r3                 # compat_sigset_t *
+        llgfr   %r4,%r4                 # compat_size_t
+        jg      compat_sys_signalfd
+
+        .globl  compat_sys_timerfd_wrapper
+compat_sys_timerfd_wrapper:
+        lgfr    %r2,%r2                 # int
+        lgfr    %r3,%r3                 # int
+        lgfr    %r4,%r4                 # int
+        llgtr   %r5,%r5                 # struct compat_itimerspec *
+        jg      compat_sys_timerfd
+
+        .globl  sys_eventfd_wrapper
+sys_eventfd_wrapper:
+        llgfr   %r2,%r2                 # unsigned int
+        jg      sys_eventfd
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index e39333ae0fcf..358d2bbbc481 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -413,7 +413,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
                         break;
                 }
         }
-        BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address));
+        kretprobe_assert(ri, orig_ret_address, trampoline_address);
         regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE;
 
         reset_current_kprobe();
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index cd8d321cd0c2..738feb4a0aad 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -322,3 +322,8 @@ NI_SYSCALL							/* 310 sys_move_pages */
 SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper)
 SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait_wrapper)
 SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes_wrapper)
+NI_SYSCALL                                                      /* 314 sys_fallocate */
+SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper)       /* 315 */
+SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd_wrapper)
+SYSCALL(sys_timerfd,sys_timerfd,compat_sys_timerfd_wrapper)
+SYSCALL(sys_eventfd,sys_eventfd,sys_eventfd_wrapper)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index e9d3432aba60..7158a804a5e4 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -21,7 +21,7 @@ SECTIONS
   . = 0x00000000;
   _text = .;                    /* Text and read-only data */
   .text : {
-        *(.text)
+        TEXT_TEXT
         SCHED_TEXT
         LOCK_TEXT
         KPROBES_TEXT
@@ -48,7 +48,7 @@ SECTIONS
   BUG_TABLE
 
   .data : {                     /* Data */
-        *(.data)
+        DATA_DATA
         CONSTRUCTORS
         }