avr32: switch to generic sigaltstack (47880695) · Commits · e / devices / android_kernel_xiaomi_markw

arch/avr32/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ config AVR32
		select GENERIC_CLOCKEVENTS
		select HAVE_MOD_ARCH_SPECIFIC
		select MODULES_USE_ELF_RELA
		select GENERIC_SIGALTSTACK
		help
		AVR32 is a high-performance 32-bit RISC microprocessor core,
		designed for cost-sensitive embedded applications, with particular

+2 −13

Original line number	Diff line number	Diff line
		@@ -21,12 +21,6 @@
		#include <asm/ucontext.h>
		#include <asm/syscalls.h>

		asmlinkage int sys_sigaltstack(const stack_t __user uss, stack_t __user uoss,
		struct pt_regs *regs)
		{
		return do_sigaltstack(uss, uoss, regs->sp);
		}

		struct rt_sigframe
		{
		struct siginfo info;
		@@ -91,7 +85,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
		if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
		goto badframe;

		if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->sp) == -EFAULT)
		if (restore_altstack(&frame->uc.uc_stack))
		goto badframe;

		pr_debug("Context restored: pc = %08lx, lr = %08lx, sp = %08lx\n",
		@@ -175,12 +169,7 @@ setup_rt_frame(int sig, struct k_sigaction ka, siginfo_t info,
		/* Set up the ucontext */
		err \|= __put_user(0, &frame->uc.uc_flags);
		err \|= __put_user(NULL, &frame->uc.uc_link);
		err \|= __put_user((void __user *)current->sas_ss_sp,
		&frame->uc.uc_stack.ss_sp);
		err \|= __put_user(sas_ss_flags(regs->sp),
		&frame->uc.uc_stack.ss_flags);
		err \|= __put_user(current->sas_ss_size,
		&frame->uc.uc_stack.ss_size);
		err \|= __save_altstack(&frame->uc.uc_stack, regs->sp);
		err \|= setup_sigcontext(&frame->uc.uc_mcontext, regs);
		err \|= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));

+0 −6

Original line number	Diff line number	Diff line
		@@ -20,12 +20,6 @@ __sys_rt_sigsuspend:
		mov r10, sp
		rjmp sys_rt_sigsuspend

		.global __sys_sigaltstack
		.type __sys_sigaltstack,@function
		__sys_sigaltstack:
		mov r10, sp
		rjmp sys_sigaltstack

		.global __sys_rt_sigreturn
		.type __sys_rt_sigreturn,@function
		__sys_rt_sigreturn:

+1 −1