diff options
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index cf03a52c3a9a..6e6ec300330f 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -299,12 +299,12 @@ void __set_special_pids(pid_t session, pid_t pgrp) | |||
299 | { | 299 | { |
300 | struct task_struct *curr = current->group_leader; | 300 | struct task_struct *curr = current->group_leader; |
301 | 301 | ||
302 | if (process_session(curr) != session) { | 302 | if (task_session_nr(curr) != session) { |
303 | detach_pid(curr, PIDTYPE_SID); | 303 | detach_pid(curr, PIDTYPE_SID); |
304 | set_signal_session(curr->signal, session); | 304 | set_task_session(curr, session); |
305 | attach_pid(curr, PIDTYPE_SID, find_pid(session)); | 305 | attach_pid(curr, PIDTYPE_SID, find_pid(session)); |
306 | } | 306 | } |
307 | if (process_group(curr) != pgrp) { | 307 | if (task_pgrp_nr(curr) != pgrp) { |
308 | detach_pid(curr, PIDTYPE_PGID); | 308 | detach_pid(curr, PIDTYPE_PGID); |
309 | curr->signal->pgrp = pgrp; | 309 | curr->signal->pgrp = pgrp; |
310 | attach_pid(curr, PIDTYPE_PGID, find_pid(pgrp)); | 310 | attach_pid(curr, PIDTYPE_PGID, find_pid(pgrp)); |
@@ -1091,10 +1091,10 @@ static int eligible_child(pid_t pid, int options, struct task_struct *p) | |||
1091 | if (p->pid != pid) | 1091 | if (p->pid != pid) |
1092 | return 0; | 1092 | return 0; |
1093 | } else if (!pid) { | 1093 | } else if (!pid) { |
1094 | if (process_group(p) != process_group(current)) | 1094 | if (task_pgrp_nr(p) != task_pgrp_nr(current)) |
1095 | return 0; | 1095 | return 0; |
1096 | } else if (pid != -1) { | 1096 | } else if (pid != -1) { |
1097 | if (process_group(p) != -pid) | 1097 | if (task_pgrp_nr(p) != -pid) |
1098 | return 0; | 1098 | return 0; |
1099 | } | 1099 | } |
1100 | 1100 | ||