Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / m32r / kernel / signal.c

diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index 8c25e0c8f6a5c752ba9c201de8292e4dd0c5120b..1c81e24fd0064a2c428ee88da199ac101f5d1169 100644 (file)
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -172,20 +172,14 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 {
        struct rt_sigframe __user *frame;
        int err = 0;
-       int signal, sig = ksig->sig;
+       int sig = ksig->sig;
 
        frame = get_sigframe(ksig, regs->spu, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
 
-       signal = current_thread_info()->exec_domain
-               && current_thread_info()->exec_domain->signal_invmap
-               && sig < 32
-               ? current_thread_info()->exec_domain->signal_invmap[sig]
-               : sig;
-
-       err |= __put_user(signal, &frame->sig);
+       err |= __put_user(sig, &frame->sig);
        if (err)
                return -EFAULT;
 
@@ -209,7 +203,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 
        /* Set up registers for signal handler */
        regs->spu = (unsigned long)frame;
-       regs->r0 = signal;      /* Arg for signal handler */
+       regs->r0 = sig; /* Arg for signal handler */
        regs->r1 = (unsigned long)&frame->info;
        regs->r2 = (unsigned long)&frame->uc;
        regs->bpc = (unsigned long)ksig->ka.sa.sa_handler;