https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.18.y&id=63407c4d1f9f64015974206e9bf40b318fdd74ee 1. Adjust to upstream adding an enum value to the end of the enum definition (where we also add one). 2. Continue to wrap the body of task_tgid_vnr() with vx_map_tgid(), similar to task_pid_vnr(). diff -urNpd linux-3.18.67-vs2.3.7.5~/include/linux/pid.h linux-3.18.67-vs2.3.7.5/include/linux/pid.h --- linux-3.18.67-vs2.3.7.5~/include/linux/pid.h 2017-08-24 21:31:56.212586227 -0500 +++ linux-3.18.67-vs2.3.7.5/include/linux/pid.h 2017-08-25 10:02:42.851831581 -0500 @@ -10,7 +10,8 @@ enum pid_type PIDTYPE_SID, PIDTYPE_MAX, /* only valid to __task_pid_nr_ns() */ - __PIDTYPE_TGID + __PIDTYPE_TGID, + PIDTYPE_REALPID }; /* diff -urNpd linux-3.18.67-vs2.3.7.5~/include/linux/sched.h linux-3.18.67-vs2.3.7.5/include/linux/sched.h --- linux-3.18.67-vs2.3.7.5~/include/linux/sched.h 2017-08-24 21:31:56.212586227 -0500 +++ linux-3.18.67-vs2.3.7.5/include/linux/sched.h 2017-08-25 10:13:28.925812909 -0500 @@ -1824,7 +1824,7 @@ static inline pid_t task_tgid_nr_ns(stru static inline pid_t task_tgid_vnr(struct task_struct *tsk) { - return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, NULL); + return vx_map_tgid(__task_pid_nr_ns(tsk, __PIDTYPE_TGID, NULL)); } static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns)