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

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

diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 3e581865c8e2a048bbc307a9d3fc4e04ad14b4d7..f9804080ccb36c3b95345a0c53cfe2cd392cfcd1 100644 (file)
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -593,24 +593,10 @@ badframe:
        return 0;
 }
 
-/*
- * OK, we're invoking a handler:
- */
-static int signr_convert(int sig)
-{
-#ifdef CONFIG_X86_32
-       struct thread_info *info = current_thread_info();
-
-       if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32)
-               return info->exec_domain->signal_invmap[sig];
-#endif /* CONFIG_X86_32 */
-       return sig;
-}
-
 static int
 setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
 {
-       int usig = signr_convert(ksig->sig);
+       int usig = ksig->sig;
        sigset_t *set = sigmask_to_save();
        compat_sigset_t *cset = (compat_sigset_t *) set;