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

[android-x86/kernel.git] / arch / tile / kernel / signal.c

diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index 8a524e3..87299a6 100644 (file)
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -151,19 +151,12 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        unsigned long restorer;
        struct rt_sigframe __user *frame;
        int err = 0, sig = ksig->sig;
-       int usig;
 
        frame = 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. */
@@ -198,7 +191,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
        regs->sp = (unsigned long) frame;
        regs->lr = restorer;
-       regs->regs[0] = (unsigned long) usig;
+       regs->regs[0] = (unsigned long) sig;
        regs->regs[1] = (unsigned long) &frame->info;
        regs->regs[2] = (unsigned long) &frame->uc;
        regs->flags |= PT_FLAGS_CALLER_SAVES;