diff options
| -rw-r--r-- | arch/blackfin/include/asm/thread_info.h | 2 | ||||
| -rw-r--r-- | arch/blackfin/kernel/signal.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/blackfin/include/asm/thread_info.h b/arch/blackfin/include/asm/thread_info.h index 962be3fb3ee1..2966b93850a1 100644 --- a/arch/blackfin/include/asm/thread_info.h +++ b/arch/blackfin/include/asm/thread_info.h | |||
| @@ -37,7 +37,6 @@ typedef unsigned long mm_segment_t; | |||
| 37 | 37 | ||
| 38 | struct thread_info { | 38 | struct thread_info { |
| 39 | struct task_struct *task; /* main task structure */ | 39 | struct task_struct *task; /* main task structure */ |
| 40 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 41 | unsigned long flags; /* low level flags */ | 40 | unsigned long flags; /* low level flags */ |
| 42 | int cpu; /* cpu we're on */ | 41 | int cpu; /* cpu we're on */ |
| 43 | int preempt_count; /* 0 => preemptable, <0 => BUG */ | 42 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
| @@ -53,7 +52,6 @@ struct thread_info { | |||
| 53 | #define INIT_THREAD_INFO(tsk) \ | 52 | #define INIT_THREAD_INFO(tsk) \ |
| 54 | { \ | 53 | { \ |
| 55 | .task = &tsk, \ | 54 | .task = &tsk, \ |
| 56 | .exec_domain = &default_exec_domain, \ | ||
| 57 | .flags = 0, \ | 55 | .flags = 0, \ |
| 58 | .cpu = 0, \ | 56 | .cpu = 0, \ |
| 59 | .preempt_count = INIT_PREEMPT_COUNT, \ | 57 | .preempt_count = INIT_PREEMPT_COUNT, \ |
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c index f2a8b5493bd3..1982a140215a 100644 --- a/arch/blackfin/kernel/signal.c +++ b/arch/blackfin/kernel/signal.c | |||
| @@ -151,11 +151,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) | |||
| 151 | 151 | ||
| 152 | frame = get_sigframe(ksig, sizeof(*frame)); | 152 | frame = get_sigframe(ksig, sizeof(*frame)); |
| 153 | 153 | ||
| 154 | err |= __put_user((current_thread_info()->exec_domain | 154 | err |= __put_user(sig->sig, &frame->sig); |
| 155 | && current_thread_info()->exec_domain->signal_invmap | ||
| 156 | && ksig->sig < 32 | ||
| 157 | ? current_thread_info()->exec_domain-> | ||
| 158 | signal_invmap[ksig->sig] : ksig->sig), &frame->sig); | ||
| 159 | 155 | ||
| 160 | err |= __put_user(&frame->info, &frame->pinfo); | 156 | err |= __put_user(&frame->info, &frame->pinfo); |
| 161 | err |= __put_user(&frame->uc, &frame->puc); | 157 | err |= __put_user(&frame->uc, &frame->puc); |
