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

Commit e181ee4c authored by Al Viro's avatar Al Viro
Browse files

s390: switch to generic old sigsuspend 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 07562be7

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ config S390 
	select GENERIC_COMPAT_RT_SIGQUEUEINFO

	select GENERIC_COMPAT_RT_SIGPROCMASK

	select GENERIC_COMPAT_RT_SIGPENDING

	select OLD_SIGSUSPEND3



config SCHED_OMIT_FRAME_POINTER

	def_bool y

arch/s390/kernel/entry.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low, 
long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);

long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high,

			u32 len_low);

long sys_sigsuspend(int history0, int history1, old_sigset_t mask);

long sys_sigaction(int sig, const struct old_sigaction __user *act,

		   struct old_sigaction __user *oact);

long sys_sigreturn(void);

arch/s390/kernel/signal.c

+0 −10
Original line number Diff line number Diff line
@@ -48,16 +48,6 @@ typedef struct 
	struct ucontext uc;

} rt_sigframe;



/*

 * Atomically swap in the new signal mask, and wait for a signal.

 */

SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask)

{

	sigset_t blocked;

	siginitset(&blocked, mask);

	return sigsuspend(&blocked);

}



SYSCALL_DEFINE3(sigaction, int, sig, const struct old_sigaction __user *, act,

		struct old_sigaction __user *, oact)

{