Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

1 files changed, 2 insertions, 9 deletions

diff --git a/include/linux/pid.h b/include/linux/pid.h
index 7633d55d9a24..14a9a39da9c7 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -7,11 +7,10 @@
 enum pid_type
 {
         PIDTYPE_PID,
+        PIDTYPE_TGID,
         PIDTYPE_PGID,
         PIDTYPE_SID,
         PIDTYPE_MAX,
-        /* only valid to __task_pid_nr_ns() */
-        __PIDTYPE_TGID
 };
 
 /*
@@ -67,12 +66,6 @@ struct pid
 
 extern struct pid init_struct_pid;
 
-struct pid_link
-{
-        struct hlist_node node;
-        struct pid *pid;
-};
-
 static inline struct pid *get_pid(struct pid *pid)
 {
         if (pid)
@@ -177,7 +170,7 @@ pid_t pid_vnr(struct pid *pid);
         do {                                                            \
                 if ((pid) != NULL)                                      \
                         hlist_for_each_entry_rcu((task),                \
-                                &(pid)->tasks[type], pids[type].node) {
+                                &(pid)->tasks[type], pid_links[type]) {
 
                         /*
                          * Both old and new leaders may be attached to