patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / s390 / kernel / compat_wrapper.S

diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 7187d1b..41adc61 100644 (file)
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -641,14 +641,14 @@ sys32_getdents_wrapper:
        llgfr   %r4,%r4                 # unsigned int
        jg      sys32_getdents          # branch to system call
 
-       .globl  sys32_select_wrapper 
-sys32_select_wrapper:
+       .globl  compat_sys_select_wrapper
+compat_sys_select_wrapper:
        lgfr    %r2,%r2                 # int
-       llgtr   %r3,%r3                 # fd_set *
-       llgtr   %r4,%r4                 # fd_set *
-       llgtr   %r5,%r5                 # fd_set *
-       llgtr   %r6,%r6                 # struct timeval_emu31 *
-       jg      sys32_select            # branch to system call
+       llgtr   %r3,%r3                 # compat_fd_set *
+       llgtr   %r4,%r4                 # compat_fd_set *
+       llgtr   %r5,%r5                 # compat_fd_set *
+       llgtr   %r6,%r6                 # struct compat_timeval *
+       jg      compat_sys_select       # branch to system call
 
        .globl  sys32_flock_wrapper 
 sys32_flock_wrapper:
@@ -663,19 +663,19 @@ sys32_msync_wrapper:
        lgfr    %r4,%r4                 # int
        jg      sys_msync               # branch to system call
 
-       .globl  sys32_readv_wrapper 
-sys32_readv_wrapper:
+       .globl  compat_sys_readv_wrapper
+compat_sys_readv_wrapper:
        lgfr    %r2,%r2                 # int
-       llgtr   %r3,%r3                 # const struct iovec_emu31 *
+       llgtr   %r3,%r3                 # const struct compat_iovec *
        llgfr   %r4,%r4                 # unsigned long
-       jg      sys32_readv             # branch to system call
+       jg      compat_sys_readv        # branch to system call
 
-       .globl  sys32_writev_wrapper 
-sys32_writev_wrapper:
+       .globl  compat_sys_writev_wrapper
+compat_sys_writev_wrapper:
        lgfr    %r2,%r2                 # int
-       llgtr   %r3,%r3                 # const struct iovec_emu31 *
+       llgtr   %r3,%r3                 # const struct compat_iovec *
        llgfr   %r4,%r4                 # unsigned long
-       jg      sys32_writev            # branch to system call
+       jg      compat_sys_writev       # branch to system call
 
        .globl  sys32_getsid_wrapper 
 sys32_getsid_wrapper:
@@ -786,12 +786,12 @@ sys32_poll_wrapper:
        lgfr    %r4,%r4                 # long 
        jg      sys_poll                # branch to system call
 
-       .globl  sys32_nfsservctl_wrapper 
-sys32_nfsservctl_wrapper:
+       .globl  compat_sys_nfsservctl_wrapper
+compat_sys_nfsservctl_wrapper:
        lgfr    %r2,%r2                 # int 
-       llgtr   %r3,%r3                 # struct nfsctl_arg_emu31 * 
-       llgtr   %r4,%r4                 # union nfsctl_res_emu31 * 
-       jg      sys32_nfsservctl        # branch to system call
+       llgtr   %r3,%r3                 # struct compat_nfsctl_arg*
+       llgtr   %r4,%r4                 # union compat_nfsctl_res*
+       jg      compat_sys_nfsservctl   # branch to system call
 
        .globl  sys32_setresgid16_wrapper 
 sys32_setresgid16_wrapper:
@@ -1097,6 +1097,8 @@ compat_sys_futex_wrapper:
        lgfr    %r4,%r4                 # int
        llgtr   %r5,%r5                 # struct compat_timespec *
        llgtr   %r6,%r6                 # u32 *
+       lgf     %r0,164(%r15)           # int
+       stg     %r0,160(%r15)
        jg      compat_sys_futex        # branch to system call
 
        .globl  sys32_setxattr_wrapper