Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-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 4aabeeaa7cf778b56104688272a4f007e939ca83..97901296894eae6785bf74edfc6cceb2842f6656 100644 (file)
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -517,10 +517,10 @@ sys32_swapoff_wrapper:
        llgtr   %r2,%r2                 # const char *
        jg      sys_swapoff             # branch to system call
 
-       .globl  sys32_sysinfo_wrapper
-sys32_sysinfo_wrapper:
+       .globl  compat_sys_sysinfo_wrapper
+compat_sys_sysinfo_wrapper:
        llgtr   %r2,%r2                 # struct sysinfo_emu31 *
-       jg      sys32_sysinfo           # branch to system call
+       jg      compat_sys_sysinfo      # branch to system call
 
        .globl  sys32_ipc_wrapper
 sys32_ipc_wrapper:
@@ -1658,3 +1658,10 @@ compat_sys_vmsplice_wrapper:
        llgfr   %r4,%r4                 # unsigned int
        llgfr   %r5,%r5                 # unsigned int
        jg      compat_sys_vmsplice
+
+       .globl  sys_getcpu_wrapper
+sys_getcpu_wrapper:
+       llgtr   %r2,%r2                 # unsigned *
+       llgtr   %r3,%r3                 # unsigned *
+       llgtr   %r4,%r4                 # struct getcpu_cache *
+       jg      sys_getcpu