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

Commit 15ce1f71 authored by Al Viro's avatar Al Viro
Browse files

x86,um: switch to generic old sigsuspend() 



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

arch/um/kernel/signal.c

+0 −10
Original line number Diff line number Diff line
@@ -122,13 +122,3 @@ int do_signal(void) 
{

	return kern_do_signal(&current->thread.regs);

}
 


/*

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

 */

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

{

	sigset_t blocked;

	siginitset(&blocked, mask);

	return sigsuspend(&blocked);

}

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ config X86 
	select GENERIC_SIGALTSTACK

	select GENERIC_COMPAT_RT_SIGQUEUEINFO

	select GENERIC_COMPAT_RT_SIGPENDING

	select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION



config INSTRUCTION_DECODER

	def_bool y

arch/x86/ia32/ia32_signal.c

+0 −7
Original line number Diff line number Diff line
@@ -129,13 +129,6 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) 
	return err;

}



asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask)

{

	sigset_t blocked;

	siginitset(&blocked, mask);

	return sigsuspend(&blocked);

}



/*

 * Do a signal return; undo the signal stack.

 */

arch/x86/include/asm/sys_ia32.h

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ asmlinkage long sys32_fallocate(int, int, unsigned, 
				unsigned, unsigned, unsigned);



/* ia32/ia32_signal.c */

asmlinkage long sys32_sigsuspend(int, int, old_sigset_t);

asmlinkage long sys32_sigreturn(void);

asmlinkage long sys32_rt_sigreturn(void);

arch/x86/include/asm/syscalls.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *); 
#ifdef CONFIG_X86_32



/* kernel/signal.c */

asmlinkage int sys_sigsuspend(int, int, old_sigset_t);

asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,

			     struct old_sigaction __user *);

unsigned long sys_sigreturn(void);