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

[uclinux-h8/linux.git] / arch / s390 / kernel / signal.c

diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 7fec60c..c551f22 100644 (file)
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -301,16 +301,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
        return (void __user *)((sp - frame_size) & -8ul);
 }
 
-static inline int map_signal(int sig)
-{
-       if (current_thread_info()->exec_domain
-           && current_thread_info()->exec_domain->signal_invmap
-           && sig < 32)
-               return current_thread_info()->exec_domain->signal_invmap[sig];
-       else
-               return sig;
-}
-
 static int setup_frame(int sig, struct k_sigaction *ka,
                       sigset_t *set, struct pt_regs * regs)
 {
@@ -378,7 +368,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                (regs->psw.mask & ~PSW_MASK_ASC);
        regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;
 
-       regs->gprs[2] = map_signal(sig);
+       regs->gprs[2] = sig;
        regs->gprs[3] = (unsigned long) &frame->sc;
 
        /* We forgot to include these in the sigcontext.
@@ -458,7 +448,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
                (regs->psw.mask & ~PSW_MASK_ASC);
        regs->psw.addr = (unsigned long) ksig->ka.sa.sa_handler | PSW_ADDR_AMODE;
 
-       regs->gprs[2] = map_signal(ksig->sig);
+       regs->gprs[2] = ksig->sig;
        regs->gprs[3] = (unsigned long) &frame->info;
        regs->gprs[4] = (unsigned long) &frame->uc;
        regs->gprs[5] = task_thread_info(current)->last_break;