[ARM] Merge sigcontext and sigmask members of sigframe

[linux-2.6] / arch / arm / kernel / signal.c

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 0ddbf2795c5b058633beb58bde12b3e863337e8f..9f1e1768e4a696cb65a425a1adf76aa222ae92b6 100644 (file)
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -193,8 +193,7 @@ struct aux_sigframe {
  * Do a signal return; undo the signal stack.  These are aligned to 64-bit.
  */
 struct sigframe {
-       struct sigcontext sc;
-       unsigned long extramask[_NSIG_WORDS-1];
+       struct ucontext uc;
        unsigned long retcode[2];
        struct aux_sigframe aux __attribute__((aligned(8)));
 };
@@ -264,10 +263,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)
 
        if (!access_ok(VERIFY_READ, frame, sizeof (*frame)))
                goto badframe;
-       if (__get_user(set.sig[0], &frame->sc.oldmask)
-           || (_NSIG_WORDS > 1
-               && __copy_from_user(&set.sig[1], &frame->extramask,
-                                   sizeof(frame->extramask))))
+       if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
                goto badframe;
 
        sigdelsetmask(&set, ~_BLOCKABLE);
@@ -276,7 +272,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
 
-       if (restore_sigcontext(regs, &frame->sc, &frame->aux))
+       if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &frame->aux))
                goto badframe;
 
        /* Send SIGTRAP if we're single-stepping */
@@ -485,12 +481,8 @@ setup_frame(int usig, struct k_sigaction *ka, sigset_t *set, struct pt_regs *reg
        if (!frame)
                return 1;
 
-       err |= setup_sigcontext(&frame->sc, &frame->aux, regs, set->sig[0]);
-
-       if (_NSIG_WORDS > 1) {
-               err |= __copy_to_user(frame->extramask, &set->sig[1],
-                                     sizeof(frame->extramask));
-       }
+       err |= setup_sigcontext(&frame->uc.uc_mcontext, &frame->aux, regs, set->sig[0]);
+       err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
 
        if (err == 0)
                err = setup_return(regs, ka, frame->retcode, frame, usig);