4 files changed, 15 insertions, 15 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)
 {
         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));
@@ -1091,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;
         }
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 61516b89cb6c..fd65bca38a93 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1283,8 +1283,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 
                 if (thread_group_leader(p)) {
                         p->signal->tty = current->signal->tty;
-                        p->signal->pgrp = process_group(current);
-                        set_signal_session(p->signal, process_session(current));
+                        p->signal->pgrp = task_pgrp_nr(current);
+                        set_task_session(p, task_session_nr(current));
                         attach_pid(p, PIDTYPE_PGID, task_pgrp(current));
                         attach_pid(p, PIDTYPE_SID, task_session(current));
 
diff --git a/kernel/signal.c b/kernel/signal.c
index e4f059cd9867..15c6940ab046 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -536,7 +536,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
                         return error;
                 error = -EPERM;
                 if (((sig != SIGCONT) ||
-                        (process_session(current) != process_session(t)))
+                        (task_session_nr(current) != task_session_nr(t)))
                     && (current->euid ^ t->suid) && (current->euid ^ t->uid)
                     && (current->uid ^ t->suid) && (current->uid ^ t->uid)
                     && !capable(CAP_KILL))
diff --git a/kernel/sys.c b/kernel/sys.c
index b8fcbc640193..4cfa213a5ac2 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -968,7 +968,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
         if (err)
                 goto out;
 
-        if (process_group(p) != pgid) {
+        if (task_pgrp_nr(p) != pgid) {
                 detach_pid(p, PIDTYPE_PGID);
                 p->signal->pgrp = pgid;
                 attach_pid(p, PIDTYPE_PGID, find_pid(pgid));
@@ -984,7 +984,7 @@ out:
 asmlinkage long sys_getpgid(pid_t pid)
 {
         if (!pid)
-                return process_group(current);
+                return task_pgrp_nr(current);
         else {
                 int retval;
                 struct task_struct *p;
@@ -996,7 +996,7 @@ asmlinkage long sys_getpgid(pid_t pid)
                 if (p) {
                         retval = security_task_getpgid(p);
                         if (!retval)
-                                retval = process_group(p);
+                                retval = task_pgrp_nr(p);
                 }
                 read_unlock(&tasklist_lock);
                 return retval;
@@ -1008,7 +1008,7 @@ asmlinkage long sys_getpgid(pid_t pid)
 asmlinkage long sys_getpgrp(void)
 {
         /* SMP - assuming writes are word atomic this is fine */
-        return process_group(current);
+        return task_pgrp_nr(current);
 }
 
 #endif
@@ -1016,7 +1016,7 @@ asmlinkage long sys_getpgrp(void)
 asmlinkage long sys_getsid(pid_t pid)
 {
         if (!pid)
-                return process_session(current);
+                return task_session_nr(current);
         else {
                 int retval;
                 struct task_struct *p;
@@ -1028,7 +1028,7 @@ asmlinkage long sys_getsid(pid_t pid)
                 if (p) {
                         retval = security_task_getsid(p);
                         if (!retval)
-                                retval = process_session(p);
+                                retval = task_session_nr(p);
                 }
                 read_unlock(&tasklist_lock);
                 return retval;
@@ -1065,7 +1065,7 @@ asmlinkage long sys_setsid(void)
         group_leader->signal->tty = NULL;
         spin_unlock(&group_leader->sighand->siglock);
 
-        err = process_group(group_leader);
+        err = task_pgrp_nr(group_leader);
 out:
         write_unlock_irq(&tasklist_lock);
         return err;