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

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

cris: switch to generic sigaltstack 



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

arch/cris/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ config CRIS 
	select GENERIC_CMOS_UPDATE

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS2

	select GENERIC_SIGALTSTACK



config HZ

	int

arch/cris/arch-v10/kernel/signal.c

+1 −7
Original line number Diff line number Diff line
@@ -84,12 +84,6 @@ int sys_sigaction(int sig, const struct old_sigaction __user *act, 
	return ret;

}



int sys_sigaltstack(const stack_t *uss, stack_t __user *uoss)

{

	return do_sigaltstack(uss, uoss, rdusp());

}





/*

 * Do a signal return; undo the signal stack.

 */
@@ -214,7 +208,7 @@ asmlinkage int sys_rt_sigreturn(long r10, long r11, long r12, long r13, 
	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))

		goto badframe;



	if (do_sigaltstack(&frame->uc.uc_stack, NULL, rdusp()) == -EFAULT)

	if (restore_altstack(&frame->uc.uc_stack))

		goto badframe;



	return regs->r10;

arch/cris/arch-v32/kernel/signal.c

+1 −7
Original line number Diff line number Diff line
@@ -99,12 +99,6 @@ sys_sigaction(int signal, const struct old_sigaction *act, 
	return retval;

}



int

sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)

{

	return do_sigaltstack(uss, uoss, rdusp());

}



static int

restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)

{
@@ -209,7 +203,7 @@ sys_rt_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp, 
	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))

		goto badframe;



	if (do_sigaltstack(&frame->uc.uc_stack, NULL, rdusp()) == -EFAULT)

	if (restore_altstack(&frame->uc.uc_stack))

		goto badframe;



	keep_debug_flags(oldccs, oldspc, regs);