diff options
Diffstat (limited to 'arch/unicore32/kernel/signal.c')
-rw-r--r-- | arch/unicore32/kernel/signal.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c index 780d77388dec..7c8fb7018dc6 100644 --- a/arch/unicore32/kernel/signal.c +++ b/arch/unicore32/kernel/signal.c | |||
@@ -254,7 +254,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, | |||
254 | 254 | ||
255 | err |= setup_sigframe(frame, regs, set); | 255 | err |= setup_sigframe(frame, regs, set); |
256 | if (err == 0) | 256 | if (err == 0) |
257 | err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig); | 257 | err |= setup_return(regs, &ksig->ka, frame->retcode, frame, |
258 | ksig->sig); | ||
258 | 259 | ||
259 | return err; | 260 | return err; |
260 | } | 261 | } |
@@ -276,7 +277,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
276 | err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp); | 277 | err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp); |
277 | err |= setup_sigframe(&frame->sig, regs, set); | 278 | err |= setup_sigframe(&frame->sig, regs, set); |
278 | if (err == 0) | 279 | if (err == 0) |
279 | err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig); | 280 | err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, |
281 | ksig->sig); | ||
280 | 282 | ||
281 | if (err == 0) { | 283 | if (err == 0) { |
282 | /* | 284 | /* |
@@ -303,7 +305,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs, | |||
303 | int syscall) | 305 | int syscall) |
304 | { | 306 | { |
305 | struct thread_info *thread = current_thread_info(); | 307 | struct thread_info *thread = current_thread_info(); |
306 | struct task_struct *tsk = current; | ||
307 | sigset_t *oldset = sigmask_to_save(); | 308 | sigset_t *oldset = sigmask_to_save(); |
308 | int usig = ksig->sig; | 309 | int usig = ksig->sig; |
309 | int ret; | 310 | int ret; |
@@ -373,7 +374,7 @@ static void do_signal(struct pt_regs *regs, int syscall) | |||
373 | if (!user_mode(regs)) | 374 | if (!user_mode(regs)) |
374 | return; | 375 | return; |
375 | 376 | ||
376 | if (get_signsl(&ksig)) { | 377 | if (get_signal(&ksig)) { |
377 | handle_signal(&ksig, regs, syscall); | 378 | handle_signal(&ksig, regs, syscall); |
378 | return; | 379 | return; |
379 | } | 380 | } |