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

Commit 9b25d604 authored by Al Viro's avatar Al Viro
Browse files

Merge branches 'arch-alpha', 'arch-arm', 'arch-arm64', 'arch-avr32',... 

Merge branches 'arch-alpha', 'arch-arm', 'arch-arm64', 'arch-avr32', 'arch-blackfin', 'arch-c6x', 'arch-cris', 'arch-frv', 'arch-h8300', 'arch-hexagon', 'arch-ia64', 'arch-m32r', 'arch-m68k', 'arch-microblaze', 'arch-mips', 'arch-mn10300', 'arch-openrisc', 'arch-parisc', 'arch-powerpc', 'arch-s390', 'arch-score', 'arch-sh', 'arch-sparc', 'arch-tile', 'arch-unicore32', 'arch-x86' and 'arch-xtensa'
parents 302627e9 50bcb7e4 51682036 47880695 79d43210 6ec78be4 e6a6d210 177b6703 b0375744 da36f98a e8d9ef09 1084f751 8be433ab de2bfce3 50150d2b 33f9f78e faec5a96 b0f95824 b1ff98cb 1cb44eb8 b774cc5c 0679a858 52ad6b3f a402922b 50b3c9e3 5b3eb3ad 0430f2f2

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ config ARM 
	select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND

	select MODULES_USE_ELF_REL

	select CLONE_BACKWARDS

	select GENERIC_SIGALTSTACK

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

arch/arm/include/asm/signal.h

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ typedef struct { 
	unsigned long sig[_NSIG_WORDS];

} sigset_t;



struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

};



#define __ARCH_HAS_SA_RESTORER



#include <asm/sigcontext.h>

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ 
		CALL(sys_getcwd)

		CALL(sys_capget)

/* 185 */	CALL(sys_capset)

		CALL(sys_sigaltstack_wrapper)

		CALL(sys_sigaltstack)

		CALL(sys_sendfile)

		CALL(sys_ni_syscall)		/* getpmsg */

		CALL(sys_ni_syscall)		/* putpmsg */

arch/arm/kernel/entry-common.S

+0 −5
Original line number Diff line number Diff line
@@ -514,11 +514,6 @@ sys_rt_sigreturn_wrapper: 
		b	sys_rt_sigreturn

ENDPROC(sys_rt_sigreturn_wrapper)



sys_sigaltstack_wrapper:

		ldr	r2, [sp, #S_OFF + S_SP]

		b	do_sigaltstack

ENDPROC(sys_sigaltstack_wrapper)



sys_statfs64_wrapper:

		teq	r1, #88

		moveq	r1, #84

arch/arm/kernel/signal.c

+2 −50
Original line number Diff line number Diff line
@@ -45,48 +45,6 @@ const unsigned long sigreturn_codes[7] = { 
	MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,

};



/*

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

 */

asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask)

{

	sigset_t blocked;

	siginitset(&blocked, mask);

	return sigsuspend(&blocked);

}



asmlinkage int 

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

	      struct old_sigaction __user *oact)

{

	struct k_sigaction new_ka, old_ka;

	int ret;



	if (act) {

		old_sigset_t mask;

		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||

		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;

		siginitset(&new_ka.sa.sa_mask, mask);

	}



	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);



	if (!ret && oact) {

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||

		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;

	}



	return ret;

}



#ifdef CONFIG_CRUNCH

static int preserve_crunch_context(struct crunch_sigframe __user *frame)

{
@@ -300,7 +258,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) 
	if (restore_sigframe(regs, &frame->sig))

		goto badframe;



	if (do_sigaltstack(&frame->sig.uc.uc_stack, NULL, regs->ARM_sp) == -EFAULT)

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

		goto badframe;



	return regs->ARM_r0;
@@ -486,7 +444,6 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, 
	       sigset_t *set, struct pt_regs *regs)

{

	struct rt_sigframe __user *frame = get_sigframe(ka, regs, sizeof(*frame));

	stack_t stack;

	int err = 0;



	if (!frame)
@@ -497,12 +454,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, 
	__put_user_error(0, &frame->sig.uc.uc_flags, err);

	__put_user_error(NULL, &frame->sig.uc.uc_link, err);



	memset(&stack, 0, sizeof(stack));

	stack.ss_sp = (void __user *)current->sas_ss_sp;

	stack.ss_flags = sas_ss_flags(regs->ARM_sp);

	stack.ss_size = current->sas_ss_size;

	err |= __copy_to_user(&frame->sig.uc.uc_stack, &stack, sizeof(stack));



	err |= __save_altstack(&frame->sig.uc.uc_stack, regs->ARM_sp);

	err |= setup_sigframe(&frame->sig, regs, set);

	if (err == 0)

		err = setup_return(regs, ka, frame->sig.retcode, frame, usig);