2 files changed, 4 insertions, 6 deletions

diff --git a/init/main.c b/init/main.c
index 9a5b18c0a63d..ed9747f00ec4 100644
--- a/init/main.c
+++ b/init/main.c
@@ -833,7 +833,6 @@ static int __init kernel_init(void * unused)
          */
         init_pid_ns.child_reaper = current;
 
-        __set_special_pids(task_pid(current));
         cad_pid = task_pid(current);
 
         smp_prepare_cpus(setup_max_cpus);
diff --git a/kernel/sys.c b/kernel/sys.c
index c326d6dceee3..7de9c984f696 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1054,12 +1054,11 @@ asmlinkage long sys_setsid(void)
         if (group_leader->signal->leader)
                 goto out;
 
-        /* Fail if a process group id already exists that equals the proposed
-         * session id.
+        /* Fail if a process group id already exists that equals the
+         * proposed session id.
          *
-         * Don't check if session == 1 because kernel threads and CLONE_NEWPID
-         * tasks use this session id and so the check will always fail and make
-         * it so init cannot successfully call setsid.
+         * Don't check if session == 1, clone(CLONE_NEWPID) creates
+         * this group/session beforehand.
          */
         if (session != 1 && pid_task(sid, PIDTYPE_PGID))
                 goto out;