vserver 1.9.5.x5

[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 41adc61..e582131 100644 (file)
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -64,7 +64,7 @@ sys32_chdir_wrapper:
        .globl  sys32_time_wrapper 
 sys32_time_wrapper:
        llgtr   %r2,%r2                 # int *
-       jg      sys_time                # branch to system call
+       jg      compat_sys_time         # branch to system call
 
        .globl  sys32_mknod_wrapper 
 sys32_mknod_wrapper:
@@ -391,7 +391,7 @@ old32_readdir_wrapper:
        llgfr   %r2,%r2                 # unsigned int
        llgtr   %r3,%r3                 # void *
        llgfr   %r4,%r4                 # unsigned int
-       jg      old32_readdir           # branch to system call
+       jg      compat_sys_old_readdir  # branch to system call
 
        .globl  old32_mmap_wrapper 
 old32_mmap_wrapper:
@@ -639,7 +639,7 @@ sys32_getdents_wrapper:
        llgfr   %r2,%r2                 # unsigned int
        llgtr   %r3,%r3                 # void *
        llgfr   %r4,%r4                 # unsigned int
-       jg      sys32_getdents          # branch to system call
+       jg      compat_sys_getdents     # branch to system call
 
        .globl  compat_sys_select_wrapper
 compat_sys_select_wrapper:
@@ -840,13 +840,13 @@ sys32_rt_sigpending_wrapper:
        llgfr   %r3,%r3                 # size_t
        jg      sys32_rt_sigpending     # branch to system call
 
-       .globl  sys32_rt_sigtimedwait_wrapper 
-sys32_rt_sigtimedwait_wrapper:
+       .globl  compat_sys_rt_sigtimedwait_wrapper
+compat_sys_rt_sigtimedwait_wrapper:
        llgtr   %r2,%r2                 # const sigset_emu31_t *
        llgtr   %r3,%r3                 # siginfo_emu31_t *
        llgtr   %r4,%r4                 # const struct compat_timespec *
        llgfr   %r5,%r5                 # size_t
-       jg      sys32_rt_sigtimedwait   # branch to system call
+       jg      compat_sys_rt_sigtimedwait      # branch to system call
 
        .globl  sys32_rt_sigqueueinfo_wrapper 
 sys32_rt_sigqueueinfo_wrapper:
@@ -1076,8 +1076,8 @@ sys32_lstat64_wrapper:
 
        .globl  sys32_stime_wrapper
 sys32_stime_wrapper:
-       llgtr   %r2,%r2                 # int *
-       jg      sys_stime               # branch to system call
+       llgtr   %r2,%r2                 # long *
+       jg      compat_sys_stime        # branch to system call
 
        .globl  sys32_sysctl_wrapper
 sys32_sysctl_wrapper:
@@ -1262,19 +1262,19 @@ sys32_fadvise64_64_wrapper:
 sys32_clock_settime_wrapper:
        lgfr    %r2,%r2                 # clockid_t (int)
        llgtr   %r3,%r3                 # struct compat_timespec *
-       jg      compat_clock_settime
+       jg      compat_sys_clock_settime
 
        .globl  sys32_clock_gettime_wrapper
 sys32_clock_gettime_wrapper:
        lgfr    %r2,%r2                 # clockid_t (int)
        llgtr   %r3,%r3                 # struct compat_timespec *
-       jg      compat_clock_gettime
+       jg      compat_sys_clock_gettime
 
        .globl  sys32_clock_getres_wrapper
 sys32_clock_getres_wrapper:
        lgfr    %r2,%r2                 # clockid_t (int)
        llgtr   %r3,%r3                 # struct compat_timespec *
-       jg      compat_clock_getres
+       jg      compat_sys_clock_getres
 
        .globl  sys32_clock_nanosleep_wrapper
 sys32_clock_nanosleep_wrapper:
@@ -1282,7 +1282,7 @@ sys32_clock_nanosleep_wrapper:
        lgfr    %r3,%r3                 # int
        llgtr   %r4,%r4                 # struct compat_timespec *
        llgtr   %r5,%r5                 # struct compat_timespec *
-       jg      compat_clock_nanosleep
+       jg      compat_sys_clock_nanosleep
 
        .globl  sys32_timer_create_wrapper
 sys32_timer_create_wrapper:
@@ -1297,13 +1297,13 @@ sys32_timer_settime_wrapper:
        lgfr    %r3,%r3                 # int
        llgtr   %r4,%r4                 # struct compat_itimerspec *
        llgtr   %r5,%r5                 # struct compat_itimerspec *
-       jg      compat_timer_settime
+       jg      compat_sys_timer_settime
 
        .globl  sys32_timer_gettime_wrapper
 sys32_timer_gettime_wrapper:
        lgfr    %r2,%r2                 # timer_t (int)
        llgtr   %r3,%r3                 # struct compat_itimerspec *
-       jg      compat_timer_gettime
+       jg      compat_sys_timer_gettime
 
        .globl  sys32_timer_getoverrun_wrapper
 sys32_timer_getoverrun_wrapper:
@@ -1354,14 +1354,14 @@ compat_sys_statfs64_wrapper:
        llgtr   %r2,%r2                 # const char *
        llgfr   %r3,%r3                 # compat_size_t
        llgtr   %r4,%r4                 # struct compat_statfs64 *
-       jg      compat_statfs64
+       jg      compat_sys_statfs64
 
        .globl compat_sys_fstatfs64_wrapper
 compat_sys_fstatfs64_wrapper:
        llgfr   %r2,%r2                 # unsigned int fd
        llgfr   %r3,%r3                 # compat_size_t
        llgtr   %r4,%r4                 # struct compat_statfs64 *
-       jg      compat_fstatfs64
+       jg      compat_sys_fstatfs64
 
        .globl  compat_sys_mq_open_wrapper
 compat_sys_mq_open_wrapper: