diff options
author | Richard Weinberger <richard@nod.at> | 2014-07-13 11:21:49 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2015-04-12 14:58:25 -0400 |
commit | 6140de5aae4a490e7320215b4197874e37e0969c (patch) | |
tree | a06134f2e7170c39d9e0dc5ca71dbdda70356498 /arch/microblaze | |
parent | a0075cd1cb79971ed6162e27fdb2ae76fc3008cf (diff) |
microblaze: 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>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/thread_info.h | 2 | ||||
-rw-r--r-- | arch/microblaze/kernel/signal.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h index b699fbd7de4a..383f387b4eee 100644 --- a/arch/microblaze/include/asm/thread_info.h +++ b/arch/microblaze/include/asm/thread_info.h | |||
@@ -65,7 +65,6 @@ typedef struct { | |||
65 | 65 | ||
66 | struct thread_info { | 66 | struct thread_info { |
67 | struct task_struct *task; /* main task structure */ | 67 | struct task_struct *task; /* main task structure */ |
68 | struct exec_domain *exec_domain; /* execution domain */ | ||
69 | unsigned long flags; /* low level flags */ | 68 | unsigned long flags; /* low level flags */ |
70 | unsigned long status; /* thread-synchronous flags */ | 69 | unsigned long status; /* thread-synchronous flags */ |
71 | __u32 cpu; /* current CPU */ | 70 | __u32 cpu; /* current CPU */ |
@@ -81,7 +80,6 @@ struct thread_info { | |||
81 | #define INIT_THREAD_INFO(tsk) \ | 80 | #define INIT_THREAD_INFO(tsk) \ |
82 | { \ | 81 | { \ |
83 | .task = &tsk, \ | 82 | .task = &tsk, \ |
84 | .exec_domain = &default_exec_domain, \ | ||
85 | .flags = 0, \ | 83 | .flags = 0, \ |
86 | .cpu = 0, \ | 84 | .cpu = 0, \ |
87 | .preempt_count = INIT_PREEMPT_COUNT, \ | 85 | .preempt_count = INIT_PREEMPT_COUNT, \ |
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index a1cbaf90e2ea..cf7d8a372a0f 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c | |||
@@ -158,7 +158,6 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
158 | { | 158 | { |
159 | struct rt_sigframe __user *frame; | 159 | struct rt_sigframe __user *frame; |
160 | int err = 0, sig = ksig->sig; | 160 | int err = 0, sig = ksig->sig; |
161 | unsigned long signal; | ||
162 | unsigned long address = 0; | 161 | unsigned long address = 0; |
163 | #ifdef CONFIG_MMU | 162 | #ifdef CONFIG_MMU |
164 | pmd_t *pmdp; | 163 | pmd_t *pmdp; |
@@ -170,12 +169,6 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
170 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) | 169 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) |
171 | return -EFAULT; | 170 | return -EFAULT; |
172 | 171 | ||
173 | signal = current_thread_info()->exec_domain | ||
174 | && current_thread_info()->exec_domain->signal_invmap | ||
175 | && sig < 32 | ||
176 | ? current_thread_info()->exec_domain->signal_invmap[sig] | ||
177 | : (unsigned long)sig; | ||
178 | |||
179 | if (ksig->ka.sa.sa_flags & SA_SIGINFO) | 172 | if (ksig->ka.sa.sa_flags & SA_SIGINFO) |
180 | err |= copy_siginfo_to_user(&frame->info, &ksig->info); | 173 | err |= copy_siginfo_to_user(&frame->info, &ksig->info); |
181 | 174 | ||
@@ -230,7 +223,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
230 | regs->r1 = (unsigned long) frame; | 223 | regs->r1 = (unsigned long) frame; |
231 | 224 | ||
232 | /* Signal handler args: */ | 225 | /* Signal handler args: */ |
233 | regs->r5 = signal; /* arg 0: signum */ | 226 | regs->r5 = sig; /* arg 0: signum */ |
234 | regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */ | 227 | regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */ |
235 | regs->r7 = (unsigned long) &frame->uc; /* arg2: ucontext */ | 228 | regs->r7 = (unsigned long) &frame->uc; /* arg2: ucontext */ |
236 | /* Offset to handle microblaze rtid r14, 0 */ | 229 | /* Offset to handle microblaze rtid r14, 0 */ |