Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[linux.git] / arch / tile / kernel / compat_signal.c

diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index c52e6fd3c4381cd18739fbed995cbf31cce5a7e4..e8c2c04143cda81db9b51018a449b611263ab68d 100644 (file)
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -195,19 +195,12 @@ int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        unsigned long restorer;
        struct compat_rt_sigframe __user *frame;
        int err = 0, sig = ksig->sig;
-       int usig;
 
        frame = compat_get_sigframe(&ksig->ka, regs, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                goto err;
 
-       usig = current_thread_info()->exec_domain
-               && current_thread_info()->exec_domain->signal_invmap
-               && sig < 32
-               ? current_thread_info()->exec_domain->signal_invmap[sig]
-               : sig;
-
        /* Always write at least the signal number for the stack backtracer. */
        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
                /* At sigreturn time, restore the callee-save registers too. */
@@ -242,7 +235,7 @@ int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
        regs->sp = ptr_to_compat_reg(frame);
        regs->lr = restorer;
-       regs->regs[0] = (unsigned long) usig;
+       regs->regs[0] = (unsigned long) sig;
        regs->regs[1] = ptr_to_compat_reg(&frame->info);
        regs->regs[2] = ptr_to_compat_reg(&frame->uc);
        regs->flags |= PT_FLAGS_CALLER_SAVES;