Commit f43e48dd authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] fixup use of sighand in m68knommu signal.c

This patch fixes the use of sighand for the m68knommu architecture.
parent e7c1f0ab
...@@ -783,7 +783,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -783,7 +783,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
/* Restart the system call the same way as /* Restart the system call the same way as
if the process were not traced. */ if the process were not traced. */
struct k_sigaction *ka = struct k_sigaction *ka =
&current->sig->action[signr-1]; &current->sighand->action[signr-1];
int has_handler = int has_handler =
(ka->sa.sa_handler != SIG_IGN && (ka->sa.sa_handler != SIG_IGN &&
ka->sa.sa_handler != SIG_DFL); ka->sa.sa_handler != SIG_DFL);
...@@ -819,7 +819,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -819,7 +819,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
} }
} }
ka = &current->sig->action[signr-1]; ka = &current->sighand->action[signr-1];
if (ka->sa.sa_handler == SIG_IGN) { if (ka->sa.sa_handler == SIG_IGN) {
if (signr != SIGCHLD) if (signr != SIGCHLD)
continue; continue;
...@@ -848,8 +848,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -848,8 +848,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
case SIGSTOP: case SIGSTOP:
current->state = TASK_STOPPED; current->state = TASK_STOPPED;
current->exit_code = signr; current->exit_code = signr;
if (!(current->parent->sig->action[SIGCHLD-1] if (!(current->parent->sighand->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDSTOP))
.sa.sa_flags & SA_NOCLDSTOP))
notify_parent(current, SIGCHLD); notify_parent(current, SIGCHLD);
schedule(); schedule();
continue; continue;
......
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