diff options
| author | Richard Weinberger <richard@nod.at> | 2014-07-13 11:19:34 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-04-12 14:58:25 -0400 |
| commit | a0075cd1cb79971ed6162e27fdb2ae76fc3008cf (patch) | |
| tree | 2163e3c15676216c68886e6571f2db897cba0258 | |
| parent | 445a626afb7f8050ac290fee89d4d9d2ce43b3f2 (diff) | |
m68k: Remove signal translation and exec_domain
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>
| -rw-r--r-- | arch/m68k/include/asm/thread_info.h | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/signal.c | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h index c54256e69e64..cee13c2e5161 100644 --- a/arch/m68k/include/asm/thread_info.h +++ b/arch/m68k/include/asm/thread_info.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | struct thread_info { | 26 | struct thread_info { |
| 27 | struct task_struct *task; /* main task structure */ | 27 | struct task_struct *task; /* main task structure */ |
| 28 | unsigned long flags; | 28 | unsigned long flags; |
| 29 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 30 | mm_segment_t addr_limit; /* thread address space */ | 29 | mm_segment_t addr_limit; /* thread address space */ |
| 31 | int preempt_count; /* 0 => preemptable, <0 => BUG */ | 30 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
| 32 | __u32 cpu; /* should always be 0 on m68k */ | 31 | __u32 cpu; /* should always be 0 on m68k */ |
| @@ -37,7 +36,6 @@ struct thread_info { | |||
| 37 | #define INIT_THREAD_INFO(tsk) \ | 36 | #define INIT_THREAD_INFO(tsk) \ |
| 38 | { \ | 37 | { \ |
| 39 | .task = &tsk, \ | 38 | .task = &tsk, \ |
| 40 | .exec_domain = &default_exec_domain, \ | ||
| 41 | .addr_limit = KERNEL_DS, \ | 39 | .addr_limit = KERNEL_DS, \ |
| 42 | .preempt_count = INIT_PREEMPT_COUNT, \ | 40 | .preempt_count = INIT_PREEMPT_COUNT, \ |
| 43 | } | 41 | } |
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index d7179281e74a..af1c4f330aef 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c | |||
| @@ -863,12 +863,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, | |||
| 863 | if (fsize) | 863 | if (fsize) |
| 864 | err |= copy_to_user (frame + 1, regs + 1, fsize); | 864 | err |= copy_to_user (frame + 1, regs + 1, fsize); |
| 865 | 865 | ||
| 866 | err |= __put_user((current_thread_info()->exec_domain | 866 | err |= __put_user(sig, &frame->sig); |
| 867 | && current_thread_info()->exec_domain->signal_invmap | ||
| 868 | && sig < 32 | ||
| 869 | ? current_thread_info()->exec_domain->signal_invmap[sig] | ||
| 870 | : sig), | ||
| 871 | &frame->sig); | ||
| 872 | 867 | ||
| 873 | err |= __put_user(regs->vector, &frame->code); | 868 | err |= __put_user(regs->vector, &frame->code); |
| 874 | err |= __put_user(&frame->sc, &frame->psc); | 869 | err |= __put_user(&frame->sc, &frame->psc); |
| @@ -948,12 +943,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
| 948 | if (fsize) | 943 | if (fsize) |
| 949 | err |= copy_to_user (&frame->uc.uc_extra, regs + 1, fsize); | 944 | err |= copy_to_user (&frame->uc.uc_extra, regs + 1, fsize); |
| 950 | 945 | ||
| 951 | err |= __put_user((current_thread_info()->exec_domain | 946 | err |= __put_user(sig, &frame->sig); |
| 952 | && current_thread_info()->exec_domain->signal_invmap | ||
| 953 | && sig < 32 | ||
| 954 | ? current_thread_info()->exec_domain->signal_invmap[sig] | ||
| 955 | : sig), | ||
| 956 | &frame->sig); | ||
| 957 | err |= __put_user(&frame->info, &frame->pinfo); | 947 | err |= __put_user(&frame->info, &frame->pinfo); |
| 958 | err |= __put_user(&frame->uc, &frame->puc); | 948 | err |= __put_user(&frame->uc, &frame->puc); |
| 959 | err |= copy_siginfo_to_user(&frame->info, &ksig->info); | 949 | err |= copy_siginfo_to_user(&frame->info, &ksig->info); |
