Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d86730bb authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin Schwidefsky
Browse files

[S390] s390: use sys_pause for 31bit pause entry point 



sys32_pause is a useless copy of the generic sys_pause.
(and it's certainly not there for old sparc32 binaries..)

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 7a0f4755

arch/s390/kernel/compat_linux.c

+0 −8
Original line number Diff line number Diff line
@@ -608,14 +608,6 @@ asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv, struct time 
	return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);

}



/* These are here just in case some old sparc32 binary calls it. */

asmlinkage long sys32_pause(void)

{

	current->state = TASK_INTERRUPTIBLE;

	schedule();

	return -ERESTARTNOHAND;

}



asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf,

				size_t count, u32 poshi, u32 poslo)

{

arch/s390/kernel/compat_linux.h

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ long sys32_gettimeofday(struct compat_timeval __user *tv, 
			struct timezone __user *tz);

long sys32_settimeofday(struct compat_timeval __user *tv,

			struct timezone __user *tz);

long sys32_pause(void);

long sys32_pread64(unsigned int fd, char __user *ubuf, size_t count,

		   u32 poshi, u32 poslo);

long sys32_pwrite64(unsigned int fd, const char __user *ubuf,

arch/s390/kernel/compat_wrapper.S

+0 −2
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ sys32_alarm_wrapper: 
	llgfr	%r2,%r2			# unsigned int

	jg	sys_alarm		# branch to system call



#sys32_pause_wrapper			# void



	.globl	compat_sys_utime_wrapper

compat_sys_utime_wrapper:

	llgtr	%r2,%r2			# char *

arch/s390/kernel/syscalls.S

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ SYSCALL(sys_stime,sys_ni_syscall,sys32_stime_wrapper) /* 25 old stime syscall * 
SYSCALL(sys_ptrace,sys_ptrace,sys32_ptrace_wrapper)

SYSCALL(sys_alarm,sys_alarm,sys32_alarm_wrapper)

NI_SYSCALL							/* old fstat syscall */

SYSCALL(sys_pause,sys_pause,sys32_pause)

SYSCALL(sys_pause,sys_pause,sys_pause)

SYSCALL(sys_utime,sys_utime,compat_sys_utime_wrapper)		/* 30 */

NI_SYSCALL							/* old stty syscall */

NI_SYSCALL							/* old gtty syscall */