Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] More verbose show_mem() like other architectures.
  [S390] Make use of kretprobe_assert.
  [S390] Wire up signald, timerfd and eventfd syscalls.
  [S390] Wire up sys_utimensat.
  [S390] cio: Update documentation.

1 files changed, 28 insertions, 0 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