pid namespaces: round up the API

[powerpc.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 44ff614..6e6ec30 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -31,7 +31,6 @@
 #include <linux/taskstats_kern.h>
 #include <linux/delayacct.h>
 #include <linux/freezer.h>
-#include <linux/cpuset.h>
 #include <linux/cgroup.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
@@ -300,12 +299,12 @@ void __set_special_pids(pid_t session, pid_t pgrp)
 {
        struct task_struct *curr = current->group_leader;
 
-       if (process_session(curr) != session) {
+       if (task_session_nr(curr) != session) {
                detach_pid(curr, PIDTYPE_SID);
-               set_signal_session(curr->signal, session);
+               set_task_session(curr, session);
                attach_pid(curr, PIDTYPE_SID, find_pid(session));
        }
-       if (process_group(curr) != pgrp) {
+       if (task_pgrp_nr(curr) != pgrp) {
                detach_pid(curr, PIDTYPE_PGID);
                curr->signal->pgrp = pgrp;
                attach_pid(curr, PIDTYPE_PGID, find_pid(pgrp));
@@ -973,7 +972,6 @@ fastcall NORET_TYPE void do_exit(long code)
        __exit_fs(tsk);
        check_stack_usage();
        exit_thread();
-       cpuset_exit(tsk);
        cgroup_exit(tsk, 1);
        exit_keys(tsk);
 
@@ -1093,10 +1091,10 @@ static int eligible_child(pid_t pid, int options, struct task_struct *p)
                if (p->pid != pid)
                        return 0;
        } else if (!pid) {
-               if (process_group(p) != process_group(current))
+               if (task_pgrp_nr(p) != task_pgrp_nr(current))
                        return 0;
        } else if (pid != -1) {
-               if (process_group(p) != -pid)
+               if (task_pgrp_nr(p) != -pid)
                        return 0;
        }