Commit 4b6cd7a7 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] (3/6) alpha fixes

 - s/p_pptr/parent/, s/p_opptr/real_parent/ done for alpha
parent 80e01aaa
...@@ -219,7 +219,7 @@ asmlinkage unsigned long sys_getxpid(int a0, int a1, int a2, int a3, int a4, ...@@ -219,7 +219,7 @@ asmlinkage unsigned long sys_getxpid(int a0, int a1, int a2, int a3, int a4,
* isn't actually going to matter, as if the parent happens * isn't actually going to matter, as if the parent happens
* to change we can happily return either of the pids. * to change we can happily return either of the pids.
*/ */
(&regs)->r20 = tsk->p_opptr->pid; (&regs)->r20 = tsk->real_parent->pid;
return tsk->pid; return tsk->pid;
} }
......
...@@ -292,7 +292,7 @@ sys_ptrace(long request, long pid, long addr, long data, ...@@ -292,7 +292,7 @@ sys_ptrace(long request, long pid, long addr, long data,
if (request != PTRACE_KILL) if (request != PTRACE_KILL)
goto out; goto out;
} }
if (child->p_pptr != current) { if (child->parent != current) {
DBG(DBG_MEM, ("child not parent of this process\n")); DBG(DBG_MEM, ("child not parent of this process\n"));
goto out; goto out;
} }
......
...@@ -661,8 +661,8 @@ do_signal(sigset_t *oldset, struct pt_regs * regs, struct switch_stack * sw, ...@@ -661,8 +661,8 @@ do_signal(sigset_t *oldset, struct pt_regs * regs, struct switch_stack * sw,
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;
} }
/* If the (new) signal is now blocked, requeue it. */ /* If the (new) signal is now blocked, requeue it. */
...@@ -701,7 +701,7 @@ do_signal(sigset_t *oldset, struct pt_regs * regs, struct switch_stack * sw, ...@@ -701,7 +701,7 @@ do_signal(sigset_t *oldset, struct pt_regs * regs, struct switch_stack * sw,
case SIGSTOP: case SIGSTOP:
current->state = TASK_STOPPED; current->state = TASK_STOPPED;
current->exit_code = signr; current->exit_code = signr;
if (!(current->p_pptr->sig->action[SIGCHLD-1] if (!(current->parent->sig->action[SIGCHLD-1]
.sa.sa_flags & SA_NOCLDSTOP)) .sa.sa_flags & SA_NOCLDSTOP))
notify_parent(current, SIGCHLD); notify_parent(current, SIGCHLD);
schedule(); schedule();
......
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