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

Commit 0980caea authored by Al Viro's avatar Al Viro
Browse files

powerpc: switch to generic old sigsuspend 



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

arch/powerpc/Kconfig

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

	select GENERIC_COMPAT_RT_SIGPROCMASK

	select GENERIC_COMPAT_RT_SIGPENDING

	select OLD_SIGSUSPEND



config EARLY_PRINTK

	bool

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ SYSCALL_SPU(sgetmask) 
COMPAT_SYS_SPU(ssetmask)

SYSCALL_SPU(setreuid)

SYSCALL_SPU(setregid)

#define compat_sys_sigsuspend sys_sigsuspend

SYS32ONLY(sigsuspend)

COMPAT_SYS(sigpending)

COMPAT_SYS_SPU(sethostname)

arch/powerpc/kernel/signal_32.c

+0 −11
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#undef DEBUG_SIG



#ifdef CONFIG_PPC64

#define sys_sigsuspend	compat_sys_sigsuspend

#define sys_rt_sigreturn	compat_sys_rt_sigreturn

#define sys_sigaction	compat_sys_sigaction

#define sys_swapcontext	compat_sys_swapcontext
@@ -238,16 +237,6 @@ static inline int restore_general_regs(struct pt_regs *regs, 


#endif /* CONFIG_PPC64 */



/*

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

 */

long sys_sigsuspend(old_sigset_t mask)

{

	sigset_t blocked;

	siginitset(&blocked, mask);

	return sigsuspend(&blocked);

}



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

		struct old_sigaction __user *oact)

{