1 files changed, 19 insertions, 32 deletions

diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index b022af6c48f8..ef275571d885 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -135,40 +135,31 @@ static inline int rt_setup_sigcontext(struct sigcontext *sc, struct pt_regs *reg
         return err;
 }
 
-static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+static inline void *get_sigframe(struct ksignal *ksig,
                                  size_t frame_size)
 {
-        unsigned long usp;
+        unsigned long usp = sigsp(rdusp(), ksig);
 
-        /* Default to using normal stack.  */
-        usp = rdusp();
-
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (!on_sig_stack(usp))
-                        usp = current->sas_ss_sp + current->sas_ss_size;
-        }
         return (void *)((usp - frame_size) & -8UL);
 }
 
 static int
-setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
-               sigset_t * set, struct pt_regs *regs)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         err |= __put_user((current_thread_info()->exec_domain
                            && current_thread_info()->exec_domain->signal_invmap
-                           && sig < 32
+                           && ksig->sig < 32
                            ? 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->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -183,7 +174,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
         /* Set up registers for signal handler */
         if (current->personality & FDPIC_FUNCPTRS) {
                 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;
                 err |= __get_user(pc, &funcptr->text);
                 err |= __get_user(p3, &funcptr->GOT);
@@ -192,7 +183,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
                 regs->pc = pc;
                 regs->p3 = p3;
         } else
-                regs->pc = (unsigned long)ka->sa.sa_handler;
+                regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
         wrusp((unsigned long)frame);
         regs->rets = SIGRETURN_STUB;
 
@@ -237,20 +228,19 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
  * OK, we're invoking a handler
  */
 static void
-handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
-              struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
+        int ret;
+
         /* are we from a system call? to see pt_regs->orig_p0 */
         if (regs->orig_p0 >= 0)
                 /* If so, check system call restarting.. */
-                handle_restart(regs, ka, 1);
+                handle_restart(regs, &ksig->ka, 1);
 
         /* set up the stack frame */
-        if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs) < 0)
-                force_sigsegv(sig, current);
-        else 
-                signal_delivered(sig, info, ka, regs,
-                                test_thread_flag(TIF_SINGLESTEP));
+        ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
+
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -264,16 +254,13 @@ handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
  */
 asmlinkage void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         current->thread.esp0 = (unsigned long)regs;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 return;
         }