]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
microblaze: Remove signal translation and exec_domain
authorRichard Weinberger <richard@nod.at>
Sun, 13 Jul 2014 15:21:49 +0000 (17:21 +0200)
committerRichard Weinberger <richard@nod.at>
Sun, 12 Apr 2015 18:58:25 +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/microblaze/include/asm/thread_info.h
arch/microblaze/kernel/signal.c

index b699fbd7de4acac800ca7c26da59ec9d18938b4f..383f387b4eeeec61c0c979dec26e98817011899e 100644 (file)
@@ -65,7 +65,6 @@ typedef struct {
 
 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 */
@@ -81,7 +80,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 a1cbaf90e2ea47215e8bfce77d7d8d113f9fd110..cf7d8a372a0f8b555be7a604b856d49a414246b9 100644 (file)
@@ -158,7 +158,6 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 {
        struct rt_sigframe __user *frame;
        int err = 0, sig = ksig->sig;
-       unsigned long signal;
        unsigned long address = 0;
 #ifdef CONFIG_MMU
        pmd_t *pmdp;
@@ -170,12 +169,6 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
 
-       signal = current_thread_info()->exec_domain
-               && current_thread_info()->exec_domain->signal_invmap
-               && sig < 32
-               ? current_thread_info()->exec_domain->signal_invmap[sig]
-               : (unsigned long)sig;
-
        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
@@ -230,7 +223,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        regs->r1 = (unsigned long) frame;
 
        /* Signal handler args: */
-       regs->r5 = signal; /* arg 0: signum */
+       regs->r5 = sig; /* arg 0: signum */
        regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */
        regs->r7 = (unsigned long) &frame->uc; /* arg2: ucontext */
        /* Offset to handle microblaze rtid r14, 0 */