frv: Remove signal translation and exec_domain
authorRichard Weinberger <richard@nod.at>
Sun, 13 Jul 2014 15:15:06 +0000 (17:15 +0200)
committerRichard Weinberger <richard@nod.at>
Sun, 12 Apr 2015 18:58:24 +0000 (20:58 +0200)
As execution domain support is gone we can remove
signal translation from the signal code and remove
exec_domain from thread_info.

Signed-off-by: Richard Weinberger <richard@nod.at>
arch/blackfin/kernel/signal.c
arch/frv/include/asm/thread_info.h
arch/frv/kernel/asm-offsets.c
arch/frv/kernel/signal.c

index 1982a140215a321894943cea2e75d191b9c91da2..ea570db598e503eb9e29dff95f5c556e05375167 100644 (file)
@@ -151,7 +151,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 
        frame = get_sigframe(ksig, sizeof(*frame));
 
-       err |= __put_user(sig->sig, &frame->sig);
+       err |= __put_user(ksig->sig, &frame->sig);
 
        err |= __put_user(&frame->info, &frame->pinfo);
        err |= __put_user(&frame->uc, &frame->puc);
index 6b917f1c29554304758f75e8fb50405da3217f68..ccba3b6ce918e64e9cd4ec106003b4e878ca4ca8 100644 (file)
@@ -31,7 +31,6 @@
 
 struct thread_info {
        struct task_struct      *task;          /* main task structure */
-       struct exec_domain      *exec_domain;   /* execution domain */
        unsigned long           flags;          /* low level flags */
        unsigned long           status;         /* thread-synchronous flags */
        __u32                   cpu;            /* current CPU */
@@ -59,7 +58,6 @@ struct thread_info {
 #define INIT_THREAD_INFO(tsk)                  \
 {                                              \
        .task           = &tsk,                 \
-       .exec_domain    = &default_exec_domain, \
        .flags          = 0,                    \
        .cpu            = 0,                    \
        .preempt_count  = INIT_PREEMPT_COUNT,   \
index 446e89d500cc4fe9db3a8ad97c655df7c6c585d0..8414293f213a417fd8a8be049409b10966f1c062 100644 (file)
@@ -34,7 +34,6 @@ void foo(void)
 {
        /* offsets into the thread_info structure */
        OFFSET(TI_TASK,                 thread_info, task);
-       OFFSET(TI_EXEC_DOMAIN,          thread_info, exec_domain);
        OFFSET(TI_FLAGS,                thread_info, flags);
        OFFSET(TI_STATUS,               thread_info, status);
        OFFSET(TI_CPU,                  thread_info, cpu);
index 336713ab47454fa2afd8e603d53255f5d91acaa0..75c602dc874ffb26ca6e17755afa1f802ad6c6c0 100644 (file)
@@ -174,7 +174,7 @@ 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;
 
        set_fs(USER_DS);
 
@@ -183,13 +183,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
        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]))
@@ -255,7 +249,7 @@ 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;
 
        set_fs(USER_DS);
 
@@ -264,13 +258,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
        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;