Merge commit 'v2.6.29-rc4' into core/percpu

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c

1 files changed, 1 insertions, 0 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 99309df985bf..c078438ba6fc 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1010,6 +1010,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;