Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[pandora-kernel.git] / arch / s390 / kernel / compat_wrapper.S

diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 672ce52..1dc96ea 100644 (file)
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -614,7 +614,7 @@ sys32_sysfs_wrapper:
 
        .globl  sys32_personality_wrapper
 sys32_personality_wrapper:
-       llgfr   %r2,%r2                 # unsigned long
+       llgfr   %r2,%r2                 # unsigned int
        jg      sys_s390_personality    # branch to system call
 
        .globl  sys32_setfsuid16_wrapper
@@ -1853,3 +1853,54 @@ sys32_execve_wrapper:
        llgtr   %r3,%r3                 # compat_uptr_t *
        llgtr   %r4,%r4                 # compat_uptr_t *
        jg      sys32_execve            # branch to system call
+
+       .globl  sys_fanotify_init_wrapper
+sys_fanotify_init_wrapper:
+       llgfr   %r2,%r2                 # unsigned int
+       llgfr   %r3,%r3                 # unsigned int
+       jg      sys_fanotify_init       # branch to system call
+
+       .globl  sys_fanotify_mark_wrapper
+sys_fanotify_mark_wrapper:
+       lgfr    %r2,%r2                 # int
+       llgfr   %r3,%r3                 # unsigned int
+       sllg    %r4,%r4,32              # get high word of 64bit mask
+       lr      %r4,%r5                 # get low word of 64bit mask
+       llgfr   %r5,%r6                 # unsigned int
+       llgt    %r6,164(%r15)           # char *
+       jg      sys_fanotify_mark       # branch to system call
+
+       .globl  sys_prlimit64_wrapper
+sys_prlimit64_wrapper:
+       lgfr    %r2,%r2                 # pid_t
+       llgfr   %r3,%r3                 # unsigned int
+       llgtr   %r4,%r4                 # const struct rlimit64 __user *
+       llgtr   %r5,%r5                 # struct rlimit64 __user *
+       jg      sys_prlimit64           # branch to system call
+
+       .globl  sys_name_to_handle_at_wrapper
+sys_name_to_handle_at_wrapper:
+       lgfr    %r2,%r2                 # int
+       llgtr   %r3,%r3                 # const char __user *
+       llgtr   %r4,%r4                 # struct file_handle __user *
+       llgtr   %r5,%r5                 # int __user *
+       lgfr    %r6,%r6                 # int
+       jg      sys_name_to_handle_at
+
+       .globl  compat_sys_open_by_handle_at_wrapper
+compat_sys_open_by_handle_at_wrapper:
+       lgfr    %r2,%r2                 # int
+       llgtr   %r3,%r3                 # struct file_handle __user *
+       lgfr    %r4,%r4                 # int
+       jg      compat_sys_open_by_handle_at
+
+       .globl  compat_sys_clock_adjtime_wrapper
+compat_sys_clock_adjtime_wrapper:
+       lgfr    %r2,%r2                 # clockid_t (int)
+       llgtr   %r3,%r3                 # struct compat_timex __user *
+       jg      compat_sys_clock_adjtime
+
+       .globl  sys_syncfs_wrapper
+sys_syncfs_wrapper:
+       lgfr    %r2,%r2                 # int
+       jg      sys_syncfs