diff options
| author | Richard Weinberger <richard@nod.at> | 2014-07-13 11:43:51 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-04-12 15:03:28 -0400 |
| commit | 3050a35fba296196cb00e87f4a96aa7d9ed17a7b (patch) | |
| tree | ca8540e7ce6533865b274242b27a44f01d9c9a11 | |
| parent | 19b6d0b6df3e6b244959d9fc373ff75323f28e92 (diff) | |
x86: 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/x86/include/asm/thread_info.h | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/signal.c | 16 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index 1d4e4f279a32..2df52baf5228 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h | |||
| @@ -19,13 +19,11 @@ | |||
| 19 | */ | 19 | */ |
| 20 | #ifndef __ASSEMBLY__ | 20 | #ifndef __ASSEMBLY__ |
| 21 | struct task_struct; | 21 | struct task_struct; |
| 22 | struct exec_domain; | ||
| 23 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
| 24 | #include <linux/atomic.h> | 23 | #include <linux/atomic.h> |
| 25 | 24 | ||
| 26 | struct thread_info { | 25 | struct thread_info { |
| 27 | struct task_struct *task; /* main task structure */ | 26 | struct task_struct *task; /* main task structure */ |
| 28 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 29 | __u32 flags; /* low level flags */ | 27 | __u32 flags; /* low level flags */ |
| 30 | __u32 status; /* thread synchronous flags */ | 28 | __u32 status; /* thread synchronous flags */ |
| 31 | __u32 cpu; /* current CPU */ | 29 | __u32 cpu; /* current CPU */ |
| @@ -39,7 +37,6 @@ struct thread_info { | |||
| 39 | #define INIT_THREAD_INFO(tsk) \ | 37 | #define INIT_THREAD_INFO(tsk) \ |
| 40 | { \ | 38 | { \ |
| 41 | .task = &tsk, \ | 39 | .task = &tsk, \ |
| 42 | .exec_domain = &default_exec_domain, \ | ||
| 43 | .flags = 0, \ | 40 | .flags = 0, \ |
| 44 | .cpu = 0, \ | 41 | .cpu = 0, \ |
| 45 | .saved_preempt_count = INIT_PREEMPT_COUNT, \ | 42 | .saved_preempt_count = INIT_PREEMPT_COUNT, \ |
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index e5042463c1bc..5ddc7ec20e75 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
| @@ -592,24 +592,10 @@ badframe: | |||
| 592 | return 0; | 592 | return 0; |
| 593 | } | 593 | } |
| 594 | 594 | ||
| 595 | /* | ||
| 596 | * OK, we're invoking a handler: | ||
| 597 | */ | ||
| 598 | static int signr_convert(int sig) | ||
| 599 | { | ||
| 600 | #ifdef CONFIG_X86_32 | ||
| 601 | struct thread_info *info = current_thread_info(); | ||
| 602 | |||
| 603 | if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32) | ||
| 604 | return info->exec_domain->signal_invmap[sig]; | ||
| 605 | #endif /* CONFIG_X86_32 */ | ||
| 606 | return sig; | ||
| 607 | } | ||
| 608 | |||
| 609 | static int | 595 | static int |
| 610 | setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) | 596 | setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) |
| 611 | { | 597 | { |
| 612 | int usig = signr_convert(ksig->sig); | 598 | int usig = ksig->sig; |
| 613 | sigset_t *set = sigmask_to_save(); | 599 | sigset_t *set = sigmask_to_save(); |
| 614 | compat_sigset_t *cset = (compat_sigset_t *) set; | 600 | compat_sigset_t *cset = (compat_sigset_t *) set; |
| 615 | 601 | ||
