avr32: Use get_signal() signal_setup_done()

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

Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>

diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index b80c0b3d2babd316798c036b1e7247b48448ea9d..dda150fe73bb13c794cc9dd3572d03714a038700 100644 (file)
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -138,13 +138,12 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, int framesize)
 }
 
 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 __user *frame;
        int err = 0;
 
-       frame = get_sigframe(ka, regs, sizeof(*frame));
+       frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
        err = -EFAULT;
        if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
                goto out;
@@ -164,7 +163,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        err = __put_user(0x3008d733 | (__NR_rt_sigreturn << 20),
                         &frame->retcode);
 
-       err |= copy_siginfo_to_user(&frame->info, info);
+       err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
        /* Set up the ucontext */
        err |= __put_user(0, &frame->uc.uc_flags);
@@ -176,12 +175,12 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        if (err)
                goto out;
 
-       regs->r12 = sig;
+       regs->r12 = ksig->sig;
        regs->r11 = (unsigned long) &frame->info;
        regs->r10 = (unsigned long) &frame->uc;
        regs->sp = (unsigned long) frame;
-       if (ka->sa.sa_flags & SA_RESTORER)
-               regs->lr = (unsigned long)ka->sa.sa_restorer;
+       if (ksig->ka.sa.sa_flags & SA_RESTORER)
+               regs->lr = (unsigned long)ksig->ka.sa.sa_restorer;
        else {
                printk(KERN_NOTICE "[%s:%d] did not set SA_RESTORER\n",
                       current->comm, current->pid);
@@ -189,10 +188,10 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        }
 
        pr_debug("SIG deliver [%s:%d]: sig=%d sp=0x%lx pc=0x%lx->0x%p lr=0x%lx\n",
-                current->comm, current->pid, sig, regs->sp,
-                regs->pc, ka->sa.sa_handler, regs->lr);
+                current->comm, current->pid, ksig->sig, regs->sp,
+                regs->pc, ksig->ka.sa.sa_handler, regs->lr);
 
-       regs->pc = (unsigned long) ka->sa.sa_handler;
+       regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
 
 out:
        return err;
@@ -208,15 +207,14 @@ static inline void setup_syscall_restart(struct pt_regs *regs)
 }
 
 static inline void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-             struct pt_regs *regs, int syscall)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs, int syscall)
 {
        int ret;
 
        /*
         * Set up the stack frame
         */
-       ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
+       ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
 
        /*
         * Check that the resulting registers are sane
@@ -226,10 +224,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
        /*
         * Block the signal if we were successful.
         */
-       if (ret != 0)
-               force_sigsegv(sig, current);
-       else
-               signal_delivered(sig, info, ka, regs, 0);
+       signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -239,9 +234,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
  */
 static void do_signal(struct pt_regs *regs, int syscall)
 {
-       siginfo_t info;
-       int signr;
-       struct k_sigaction ka;
+       struct ksignal ksig;
 
        /*
         * We want the common case to go fast, which is why we may in
@@ -251,18 +244,18 @@ static void do_signal(struct pt_regs *regs, int syscall)
        if (!user_mode(regs))
                return;
 
-       signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+       get_signal(&ksig);
        if (syscall) {
                switch (regs->r12) {
                case -ERESTART_RESTARTBLOCK:
                case -ERESTARTNOHAND:
-                       if (signr > 0) {
+                       if (ksig.sig > 0) {
                                regs->r12 = -EINTR;
                                break;
                        }
                        /* fall through */
                case -ERESTARTSYS:
-                       if (signr > 0 && !(ka.sa.sa_flags & SA_RESTART)) {
+                       if (ksig.sig > 0 && !(ksig.ka.sa.sa_flags & SA_RESTART)) {
                                regs->r12 = -EINTR;
                                break;
                        }
@@ -272,13 +265,13 @@ static void do_signal(struct pt_regs *regs, int syscall)
                }
        }
 
-       if (signr == 0) {
+       if (!ksig.sig) {
                /* No signal to deliver -- put the saved sigmask back */
                restore_saved_sigmask();
                return;
        }
 
-       handle_signal(signr, &ka, &info, regs, syscall);
+       handle_signal(&ksig, regs, syscall);
 }
 
 asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)