3 files changed, 4 insertions, 4 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 68d27039ef7d..6838d4d77e05 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -306,7 +306,7 @@ void __set_special_pids(pid_t session, pid_t pgrp)
         }
         if (task_pgrp_nr(curr) != pgrp) {
                 detach_pid(curr, PIDTYPE_PGID);
-                curr->signal->pgrp = pgrp;
+                set_task_pgrp(curr, pgrp);
                 attach_pid(curr, PIDTYPE_PGID, find_pid(pgrp));
         }
 }
diff --git a/kernel/fork.c b/kernel/fork.c
index 240aa6601f5b..9d40367dd5db 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1293,13 +1293,13 @@ static struct task_struct *copy_process(unsigned long clone_flags,
                         if (clone_flags & CLONE_NEWPID) {
                                 p->nsproxy->pid_ns->child_reaper = p;
                                 p->signal->tty = NULL;
-                                p->signal->pgrp = p->pid;
+                                set_task_pgrp(p, p->pid);
                                 set_task_session(p, p->pid);
                                 attach_pid(p, PIDTYPE_PGID, pid);
                                 attach_pid(p, PIDTYPE_SID, pid);
                         } else {
                                 p->signal->tty = current->signal->tty;
-                                p->signal->pgrp = task_pgrp_nr(current);
+                                set_task_pgrp(p, task_pgrp_nr(current));
                                 set_task_session(p, task_session_nr(current));
                                 attach_pid(p, PIDTYPE_PGID,
                                                 task_pgrp(current));
diff --git a/kernel/sys.c b/kernel/sys.c
index 2befc299129d..304b5410d746 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -977,7 +977,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
                 detach_pid(p, PIDTYPE_PGID);
                 pid = find_vpid(pgid);
                 attach_pid(p, PIDTYPE_PGID, pid);
-                p->signal->pgrp = pid_nr(pid);
+                set_task_pgrp(p, pid_nr(pid));
         }
 
         err = 0;