diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-25 18:42:04 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 23:00:23 -0500 |
commit | d5dc77bfeeab0b03a32e3db5e31e2f64605634ab (patch) | |
tree | 7cdf557d1310db607d164d576d8cc5799d4aaf36 /arch/s390 | |
parent | 76b021d053ed0b8de9689eefca5e8f53dade7fd7 (diff) |
consolidate compat lookup_dcookie()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 7 | ||||
-rw-r--r-- | arch/s390/kernel/syscalls.S | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 68117a3dd252..6d4958ea390b 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
@@ -926,13 +926,6 @@ ENTRY(sys_epoll_wait_wrapper) | |||
926 | lgfr %r5,%r5 # int | 926 | lgfr %r5,%r5 # int |
927 | jg sys_epoll_wait # branch to system call | 927 | jg sys_epoll_wait # branch to system call |
928 | 928 | ||
929 | ENTRY(sys32_lookup_dcookie_wrapper) | ||
930 | sllg %r2,%r2,32 # get high word of 64bit dcookie | ||
931 | or %r2,%r3 # get low word of 64bit dcookie | ||
932 | llgtr %r3,%r4 # char * | ||
933 | llgfr %r4,%r5 # size_t | ||
934 | jg sys_lookup_dcookie | ||
935 | |||
936 | ENTRY(sys32_fadvise64_wrapper) | 929 | ENTRY(sys32_fadvise64_wrapper) |
937 | lgfr %r2,%r2 # int | 930 | lgfr %r2,%r2 # int |
938 | sllg %r3,%r3,32 # get high word of 64bit loff_t | 931 | sllg %r3,%r3,32 # get high word of 64bit loff_t |
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index 102254a4397d..9154e17f25b9 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S | |||
@@ -118,7 +118,7 @@ SYSCALL(sys_newstat,sys_newstat,compat_sys_newstat_wrapper) | |||
118 | SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat_wrapper) | 118 | SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat_wrapper) |
119 | SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat_wrapper) | 119 | SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat_wrapper) |
120 | NI_SYSCALL /* old uname syscall */ | 120 | NI_SYSCALL /* old uname syscall */ |
121 | SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,sys32_lookup_dcookie_wrapper) /* 110 */ | 121 | SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,compat_sys_lookup_dcookie) /* 110 */ |
122 | SYSCALL(sys_vhangup,sys_vhangup,sys_vhangup) | 122 | SYSCALL(sys_vhangup,sys_vhangup,sys_vhangup) |
123 | NI_SYSCALL /* old "idle" system call */ | 123 | NI_SYSCALL /* old "idle" system call */ |
124 | NI_SYSCALL /* vm86old for i386 */ | 124 | NI_SYSCALL /* vm86old for i386 */ |