diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 12:49:06 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 22:59:36 -0500 |
commit | 8d2d5c4a251924e4f70657e96a2a3f87647544f0 (patch) | |
tree | ada470f9738d49bfc2d55cb01f8c62188ce8ae12 /arch/s390/kernel | |
parent | 35280bd4a3fa841897e2638437607fdec6c34f31 (diff) |
switch getrusage() to COMPAT_SYSCALL_DEFINE
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 5 | ||||
-rw-r--r-- | arch/s390/kernel/syscalls.S | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 52bea71d93e6..cee31d7910c0 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
@@ -258,11 +258,6 @@ ENTRY(sys32_mmap2_wrapper) | |||
258 | llgtr %r2,%r2 # struct mmap_arg_struct_emu31 * | 258 | llgtr %r2,%r2 # struct mmap_arg_struct_emu31 * |
259 | jg sys32_mmap2 # branch to system call | 259 | jg sys32_mmap2 # branch to system call |
260 | 260 | ||
261 | ENTRY(compat_sys_getrusage_wrapper) | ||
262 | lgfr %r2,%r2 # int | ||
263 | llgtr %r3,%r3 # struct rusage_emu31 * | ||
264 | jg compat_sys_getrusage # branch to system call | ||
265 | |||
266 | ENTRY(compat_sys_gettimeofday_wrapper) | 261 | ENTRY(compat_sys_gettimeofday_wrapper) |
267 | llgtr %r2,%r2 # struct timeval_emu31 * | 262 | llgtr %r2,%r2 # struct timeval_emu31 * |
268 | llgtr %r3,%r3 # struct timezone * | 263 | llgtr %r3,%r3 # struct timezone * |
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index 63d6b4343193..e9c8a88c748e 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S | |||
@@ -85,7 +85,7 @@ SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper) | |||
85 | SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper) | 85 | SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper) |
86 | SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper) /* 75 */ | 86 | SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper) /* 75 */ |
87 | SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper) | 87 | SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper) |
88 | SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage_wrapper) | 88 | SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage) |
89 | SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper) | 89 | SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper) |
90 | SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper) | 90 | SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper) |
91 | SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper) /* 80 old getgroups16 syscall */ | 91 | SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper) /* 80 old getgroups16 syscall */ |