diff options
| -rw-r--r-- | arch/unicore32/include/asm/thread_info.h | 3 | ||||
| -rw-r--r-- | arch/unicore32/kernel/asm-offsets.c | 1 | ||||
| -rw-r--r-- | arch/unicore32/kernel/signal.c | 7 |
3 files changed, 0 insertions, 11 deletions
diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h index 63e2839dfeb8..e79ad6d5b5b2 100644 --- a/arch/unicore32/include/asm/thread_info.h +++ b/arch/unicore32/include/asm/thread_info.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #ifndef __ASSEMBLY__ | 24 | #ifndef __ASSEMBLY__ |
| 25 | 25 | ||
| 26 | struct task_struct; | 26 | struct task_struct; |
| 27 | struct exec_domain; | ||
| 28 | 27 | ||
| 29 | #include <asm/types.h> | 28 | #include <asm/types.h> |
| 30 | 29 | ||
| @@ -71,7 +70,6 @@ struct thread_info { | |||
| 71 | /* <0 => bug */ | 70 | /* <0 => bug */ |
| 72 | mm_segment_t addr_limit; /* address limit */ | 71 | mm_segment_t addr_limit; /* address limit */ |
| 73 | struct task_struct *task; /* main task structure */ | 72 | struct task_struct *task; /* main task structure */ |
| 74 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 75 | __u32 cpu; /* cpu */ | 73 | __u32 cpu; /* cpu */ |
| 76 | struct cpu_context_save cpu_context; /* cpu context */ | 74 | struct cpu_context_save cpu_context; /* cpu context */ |
| 77 | __u32 syscall; /* syscall number */ | 75 | __u32 syscall; /* syscall number */ |
| @@ -84,7 +82,6 @@ struct thread_info { | |||
| 84 | #define INIT_THREAD_INFO(tsk) \ | 82 | #define INIT_THREAD_INFO(tsk) \ |
| 85 | { \ | 83 | { \ |
| 86 | .task = &tsk, \ | 84 | .task = &tsk, \ |
| 87 | .exec_domain = &default_exec_domain, \ | ||
| 88 | .flags = 0, \ | 85 | .flags = 0, \ |
| 89 | .preempt_count = INIT_PREEMPT_COUNT, \ | 86 | .preempt_count = INIT_PREEMPT_COUNT, \ |
| 90 | .addr_limit = KERNEL_DS, \ | 87 | .addr_limit = KERNEL_DS, \ |
diff --git a/arch/unicore32/kernel/asm-offsets.c b/arch/unicore32/kernel/asm-offsets.c index ffcbe7536ca7..80d50c4651e3 100644 --- a/arch/unicore32/kernel/asm-offsets.c +++ b/arch/unicore32/kernel/asm-offsets.c | |||
| @@ -42,7 +42,6 @@ int main(void) | |||
| 42 | DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); | 42 | DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); |
| 43 | DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit)); | 43 | DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit)); |
| 44 | DEFINE(TI_TASK, offsetof(struct thread_info, task)); | 44 | DEFINE(TI_TASK, offsetof(struct thread_info, task)); |
| 45 | DEFINE(TI_EXEC_DOMAIN, offsetof(struct thread_info, exec_domain)); | ||
| 46 | DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); | 45 | DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); |
| 47 | DEFINE(TI_CPU_SAVE, offsetof(struct thread_info, cpu_context)); | 46 | DEFINE(TI_CPU_SAVE, offsetof(struct thread_info, cpu_context)); |
| 48 | DEFINE(TI_USED_CP, offsetof(struct thread_info, used_cp)); | 47 | DEFINE(TI_USED_CP, offsetof(struct thread_info, used_cp)); |
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c index d329f85766cc..4ae51cf15ade 100644 --- a/arch/unicore32/kernel/signal.c +++ b/arch/unicore32/kernel/signal.c | |||
| @@ -330,13 +330,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs, | |||
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | /* | 332 | /* |
| 333 | * translate the signal | ||
| 334 | */ | ||
| 335 | if (usig < 32 && thread->exec_domain | ||
| 336 | && thread->exec_domain->signal_invmap) | ||
| 337 | usig = thread->exec_domain->signal_invmap[usig]; | ||
| 338 | |||
| 339 | /* | ||
| 340 | * Set up the stack frame | 333 | * Set up the stack frame |
| 341 | */ | 334 | */ |
| 342 | if (ksig->ka.sa.sa_flags & SA_SIGINFO) | 335 | if (ksig->ka.sa.sa_flags & SA_SIGINFO) |
