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

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

diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 85ca6727ca075c8ce47ca73f801ed612cdeeb86d..82d5e914dc1591c010130068bcd517777dd54bd5 100644 (file)
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -174,20 +174,14 @@ static inline void __user *get_sigframe(struct ksignal *ksig,
 static int setup_frame(struct ksignal *ksig, sigset_t *set)
 {
        struct sigframe __user *frame;
-       int rsig, sig = ksig->sig;
+       int sig = ksig->sig;
 
        frame = get_sigframe(ksig, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
 
-       rsig = sig;
-       if (sig < 32 &&
-           __current_thread_info->exec_domain &&
-           __current_thread_info->exec_domain->signal_invmap)
-               rsig = __current_thread_info->exec_domain->signal_invmap[sig];
-
-       if (__put_user(rsig, &frame->sig) < 0)
+       if (__put_user(sig, &frame->sig) < 0)
                return -EFAULT;
 
        if (setup_sigcontext(&frame->sc, set->sig[0]))
@@ -253,20 +247,14 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
 static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
 {
        struct rt_sigframe __user *frame;
-       int rsig, sig = ksig->sig;
+       int sig = ksig->sig;
 
        frame = get_sigframe(ksig, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
 
-       rsig = sig;
-       if (sig < 32 &&
-           __current_thread_info->exec_domain &&
-           __current_thread_info->exec_domain->signal_invmap)
-               rsig = __current_thread_info->exec_domain->signal_invmap[sig];
-
-       if (__put_user(rsig,            &frame->sig) ||
+       if (__put_user(sig,             &frame->sig) ||
            __put_user(&frame->info,    &frame->pinfo) ||
            __put_user(&frame->uc,      &frame->puc))
                return -EFAULT;