diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/compat_linux.c | 8 | ||||
-rw-r--r-- | arch/s390/kernel/compat_linux.h | 1 | ||||
-rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 2 | ||||
-rw-r--r-- | arch/s390/kernel/syscalls.S | 2 |
4 files changed, 1 insertions, 12 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index d7f22226fc4e..98e246dc0233 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c | |||
@@ -608,14 +608,6 @@ asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv, struct time | |||
608 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); | 608 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); |
609 | } | 609 | } |
610 | 610 | ||
611 | /* These are here just in case some old sparc32 binary calls it. */ | ||
612 | asmlinkage long sys32_pause(void) | ||
613 | { | ||
614 | current->state = TASK_INTERRUPTIBLE; | ||
615 | schedule(); | ||
616 | return -ERESTARTNOHAND; | ||
617 | } | ||
618 | |||
619 | asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf, | 611 | asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf, |
620 | size_t count, u32 poshi, u32 poslo) | 612 | size_t count, u32 poshi, u32 poslo) |
621 | { | 613 | { |
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h index 20723a062017..05f8516366ab 100644 --- a/arch/s390/kernel/compat_linux.h +++ b/arch/s390/kernel/compat_linux.h | |||
@@ -206,7 +206,6 @@ long sys32_gettimeofday(struct compat_timeval __user *tv, | |||
206 | struct timezone __user *tz); | 206 | struct timezone __user *tz); |
207 | long sys32_settimeofday(struct compat_timeval __user *tv, | 207 | long sys32_settimeofday(struct compat_timeval __user *tv, |
208 | struct timezone __user *tz); | 208 | struct timezone __user *tz); |
209 | long sys32_pause(void); | ||
210 | long sys32_pread64(unsigned int fd, char __user *ubuf, size_t count, | 209 | long sys32_pread64(unsigned int fd, char __user *ubuf, size_t count, |
211 | u32 poshi, u32 poslo); | 210 | u32 poshi, u32 poslo); |
212 | long sys32_pwrite64(unsigned int fd, const char __user *ubuf, | 211 | long sys32_pwrite64(unsigned int fd, const char __user *ubuf, |
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 328a20e880b5..ee51ca9e23b5 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
@@ -128,8 +128,6 @@ sys32_alarm_wrapper: | |||
128 | llgfr %r2,%r2 # unsigned int | 128 | llgfr %r2,%r2 # unsigned int |
129 | jg sys_alarm # branch to system call | 129 | jg sys_alarm # branch to system call |
130 | 130 | ||
131 | #sys32_pause_wrapper # void | ||
132 | |||
133 | .globl compat_sys_utime_wrapper | 131 | .globl compat_sys_utime_wrapper |
134 | compat_sys_utime_wrapper: | 132 | compat_sys_utime_wrapper: |
135 | llgtr %r2,%r2 # char * | 133 | llgtr %r2,%r2 # char * |
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index c66d35e55142..3ae303914b42 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S | |||
@@ -37,7 +37,7 @@ SYSCALL(sys_stime,sys_ni_syscall,sys32_stime_wrapper) /* 25 old stime syscall * | |||
37 | SYSCALL(sys_ptrace,sys_ptrace,sys32_ptrace_wrapper) | 37 | SYSCALL(sys_ptrace,sys_ptrace,sys32_ptrace_wrapper) |
38 | SYSCALL(sys_alarm,sys_alarm,sys32_alarm_wrapper) | 38 | SYSCALL(sys_alarm,sys_alarm,sys32_alarm_wrapper) |
39 | NI_SYSCALL /* old fstat syscall */ | 39 | NI_SYSCALL /* old fstat syscall */ |
40 | SYSCALL(sys_pause,sys_pause,sys32_pause) | 40 | SYSCALL(sys_pause,sys_pause,sys_pause) |
41 | SYSCALL(sys_utime,sys_utime,compat_sys_utime_wrapper) /* 30 */ | 41 | SYSCALL(sys_utime,sys_utime,compat_sys_utime_wrapper) /* 30 */ |
42 | NI_SYSCALL /* old stty syscall */ | 42 | NI_SYSCALL /* old stty syscall */ |
43 | NI_SYSCALL /* old gtty syscall */ | 43 | NI_SYSCALL /* old gtty syscall */ |