Commit 1270cff1 authored by Richard Weinberger's avatar Richard Weinberger Committed by Richard Weinberger
Browse files

blackfin: Use get_signal() signal_setup_done() 



Use the more generic functions get_signal() signal_setup_done()
for signal delivery.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Acked-by: default avatarSteven Miao <realmz6@gmail.com>
parent d809709a

arch/blackfin/kernel/signal.c

+17 −22
Original line number Original line Diff line number Diff line
@@ -152,23 +152,22 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, 
}

}





static int

static int

setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,

setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)

	       sigset_t * set, struct pt_regs *regs)

{

{

	struct rt_sigframe *frame;

	struct rt_sigframe *frame;

	int err = 0;

	int err = 0;





	frame = get_sigframe(ka, regs, sizeof(*frame));

	frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));





	err |= __put_user((current_thread_info()->exec_domain

	err |= __put_user((current_thread_info()->exec_domain

			   && current_thread_info()->exec_domain->signal_invmap

			   && current_thread_info()->exec_domain->signal_invmap

			   && sig < 32

			   && ksig->sig < 32

			   ? current_thread_info()->exec_domain->

			   ? current_thread_info()->exec_domain->

			   signal_invmap[sig] : sig), &frame->sig);

			   signal_invmap[ksig->sig] : ksig->sig), &frame->sig);





	err |= __put_user(&frame->info, &frame->pinfo);

	err |= __put_user(&frame->info, &frame->pinfo);

	err |= __put_user(&frame->uc, &frame->puc);

	err |= __put_user(&frame->uc, &frame->puc);

	err |= copy_siginfo_to_user(&frame->info, info);

	err |= copy_siginfo_to_user(&frame->info, &ksig->info);





	/* Create the ucontext.  */

	/* Create the ucontext.  */

	err |= __put_user(0, &frame->uc.uc_flags);

	err |= __put_user(0, &frame->uc.uc_flags);
@@ -183,7 +182,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info, 
	/* Set up registers for signal handler */

	/* Set up registers for signal handler */

	if (current->personality & FDPIC_FUNCPTRS) {

	if (current->personality & FDPIC_FUNCPTRS) {

		struct fdpic_func_descriptor __user *funcptr =

		struct fdpic_func_descriptor __user *funcptr =

			(struct fdpic_func_descriptor *) ka->sa.sa_handler;

			(struct fdpic_func_descriptor *) ksig->ka.sa.sa_handler;

		u32 pc, p3;

		u32 pc, p3;

		err |= __get_user(pc, &funcptr->text);

		err |= __get_user(pc, &funcptr->text);

		err |= __get_user(p3, &funcptr->GOT);

		err |= __get_user(p3, &funcptr->GOT);
@@ -192,7 +191,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info, 
		regs->pc = pc;

		regs->pc = pc;

		regs->p3 = p3;

		regs->p3 = p3;

	} else

	} else

		regs->pc = (unsigned long)ka->sa.sa_handler;

		regs->pc = (unsigned long)ksig->ka.sa.sa_handler;

	wrusp((unsigned long)frame);

	wrusp((unsigned long)frame);

	regs->rets = SIGRETURN_STUB;

	regs->rets = SIGRETURN_STUB;
@@ -237,20 +236,19 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler) 
 * OK, we're invoking a handler

 * OK, we're invoking a handler

 */

 */

static void

static void

handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,

handle_signal(struct ksignal *ksig, struct pt_regs *regs)

	      struct pt_regs *regs)

{

{

	int ret;



	/* are we from a system call? to see pt_regs->orig_p0 */

	/* are we from a system call? to see pt_regs->orig_p0 */

	if (regs->orig_p0 >= 0)

	if (regs->orig_p0 >= 0)

		/* If so, check system call restarting.. */

		/* If so, check system call restarting.. */

		handle_restart(regs, ka, 1);

		handle_restart(regs, &ksig->ka, 1);





	/* set up the stack frame */

	/* set up the stack frame */

	if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs) < 0)

	ret = setup_rt_frame(ksig, sigmask_to_save(), regs);

		force_sigsegv(sig, current);



	else 

	signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));

		signal_delivered(sig, info, ka, regs,

				test_thread_flag(TIF_SINGLESTEP));

}

}





/*

/*
@@ -264,16 +262,13 @@ handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka, 
 */

 */

asmlinkage void do_signal(struct pt_regs *regs)

asmlinkage void do_signal(struct pt_regs *regs)

{

{

	siginfo_t info;

	struct ksignal ksig;

	int signr;

	struct k_sigaction ka;





	current->thread.esp0 = (unsigned long)regs;

	current->thread.esp0 = (unsigned long)regs;





	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (get_signal(&ksig)) {

	if (signr > 0) {

		/* Whee!  Actually deliver the signal.  */

		/* Whee!  Actually deliver the signal.  */

		handle_signal(signr, &info, &ka, regs);

		handle_signal(&ksig, regs);

		return;

		return;

	}

	}