Merge tag 'md/3.12' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index bf46287c91a45cc4f52d348d4be503e1ecf94620..c9eaf20130021fbe3c8b24f4634ff7cd0ef02c3f 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1824,11 +1824,6 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
         */
        if (unshare_flags & CLONE_NEWUSER)
                unshare_flags |= CLONE_THREAD | CLONE_FS;
-       /*
-        * If unsharing a pid namespace must also unshare the thread.
-        */
-       if (unshare_flags & CLONE_NEWPID)
-               unshare_flags |= CLONE_THREAD;
        /*
         * If unsharing a thread from a thread group, must also unshare vm.
         */