Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 242a706e77218073f74b9b8aa44ca589aaa1cbf4..6d5dbb7a13e253132f9281fcfaf9a112f576ff38 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1005,6 +1005,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         * triggers too late. This doesn't hurt, the check is only there
         * to stop root fork bombs.
         */
+       retval = -EAGAIN;
        if (nr_threads >= max_threads)
                goto bad_fork_cleanup_count;