Commit ce0a05cc authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] m68k: rename p_pptr [14/20]

Rename p_pptr into parent.
parent be0477de
...@@ -141,7 +141,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -141,7 +141,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
if (request != PTRACE_KILL) if (request != PTRACE_KILL)
goto out_tsk; goto out_tsk;
} }
if (child->p_pptr != current) if (child->parent != current)
goto out_tsk; goto out_tsk;
switch (request) { switch (request) {
......
...@@ -1083,9 +1083,9 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -1083,9 +1083,9 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
info.si_signo = signr; info.si_signo = signr;
info.si_errno = 0; info.si_errno = 0;
info.si_code = SI_USER; info.si_code = SI_USER;
info.si_pid = current->p_pptr->pid; info.si_pid = current->parent->pid;
info.si_uid = current->p_pptr->uid; info.si_uid = current->parent->uid;
info.si_uid16 = high2lowuid(current->p_pptr->uid); info.si_uid16 = high2lowuid(current->parent->uid);
} }
/* If the (new) signal is now blocked, requeue it. */ /* If the (new) signal is now blocked, requeue it. */
...@@ -1121,14 +1121,17 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) ...@@ -1121,14 +1121,17 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
continue; continue;
/* FALLTHRU */ /* FALLTHRU */
case SIGSTOP: case SIGSTOP: {
struct signal_struct *sig;
current->state = TASK_STOPPED; current->state = TASK_STOPPED;
current->exit_code = signr; current->exit_code = signr;
if (!(current->p_pptr->sig->action[SIGCHLD-1] sig = current->parent->sig;
.sa.sa_flags & SA_NOCLDSTOP)) if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags
& SA_NOCLDSTOP))
notify_parent(current, SIGCHLD); notify_parent(current, SIGCHLD);
schedule(); schedule();
continue; continue;
}
case SIGQUIT: case SIGILL: case SIGTRAP: case SIGQUIT: case SIGILL: case SIGTRAP:
case SIGIOT: case SIGFPE: case SIGSEGV: case SIGIOT: case SIGFPE: case SIGSEGV:
......
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