diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/init_task.h | 3 | ||||
| -rw-r--r-- | include/linux/sched.h | 19 |
2 files changed, 17 insertions, 5 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 5ac5945696a0..cae35b6b9aec 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -67,9 +67,6 @@ .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \ .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \ .rlim = INIT_RLIMITS, \ - .pgrp = 0, \ - .tty_old_pgrp = NULL, \ - { .__session = 0}, \ } extern struct nsproxy init_nsproxy; diff --git a/include/linux/sched.h b/include/linux/sched.h index 4bbbe12880d7..13df99fb2769 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -429,7 +429,17 @@ struct signal_struct { cputime_t it_prof_incr, it_virt_incr; /* job control IDs */ - pid_t pgrp; + + /* + * pgrp and session fields are deprecated. + * use the task_session_Xnr and task_pgrp_Xnr routines below + */ + + union { + pid_t pgrp __deprecated; + pid_t __pgrp; + }; + struct pid *tty_old_pgrp; union { @@ -1196,6 +1206,11 @@ static inline void set_task_session(struct task_struct *tsk, pid_t session) tsk->signal->__session = session; } +static inline void set_task_pgrp(struct task_struct *tsk, pid_t pgrp) +{ + tsk->signal->__pgrp = pgrp; +} + static inline struct pid *task_pid(struct task_struct *task) { return task->pids[PIDTYPE_PID].pid; @@ -1268,7 +1283,7 @@ static inline pid_t task_tgid_vnr(struct task_struct *tsk) static inline pid_t task_pgrp_nr(struct task_struct *tsk) { - return tsk->signal->pgrp; + return tsk->signal->__pgrp; } pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns); |