Commit 3bcb84ab authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds

[PATCH] mips: fixed do_signal in arch/mips/kernel/signal.c

The change of get_signal_to_deliver() is followed.
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b1c28c42
...@@ -480,10 +480,8 @@ extern void setup_rt_frame_n32(struct k_sigaction * ka, ...@@ -480,10 +480,8 @@ extern void setup_rt_frame_n32(struct k_sigaction * ka,
struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info); struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);
static inline void handle_signal(unsigned long sig, siginfo_t *info, static inline void handle_signal(unsigned long sig, siginfo_t *info,
sigset_t *oldset, struct pt_regs *regs) struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
{ {
struct k_sigaction *ka = &current->sighand->action[sig-1];
switch(regs->regs[0]) { switch(regs->regs[0]) {
case ERESTART_RESTARTBLOCK: case ERESTART_RESTARTBLOCK:
case ERESTARTNOHAND: case ERESTARTNOHAND:
...@@ -535,6 +533,7 @@ extern int do_irix_signal(sigset_t *oldset, struct pt_regs *regs); ...@@ -535,6 +533,7 @@ extern int do_irix_signal(sigset_t *oldset, struct pt_regs *regs);
asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
{ {
struct k_sigaction ka;
siginfo_t info; siginfo_t info;
int signr; int signr;
...@@ -560,9 +559,9 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -560,9 +559,9 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
if (!oldset) if (!oldset)
oldset = &current->blocked; oldset = &current->blocked;
signr = get_signal_to_deliver(&info, regs, NULL); signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (signr > 0) { if (signr > 0) {
handle_signal(signr, &info, oldset, regs); handle_signal(signr, &info, &ka, oldset, regs);
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment