Merge commit 'v2.6.29-rc1' into timers/urgent

diff --combined kernel/fork.c
index 7087d8c0e5e23d93cc3610f6e3de271a1f165cf5,1d68f1255dd824cf2fd1c06a1e6464bac718d26f..e995899ea83f882f1eb7514d8e17f3be48a2406d
--- 1/kernel/fork.c
--- 2/kernel/fork.c
+++ b/kernel/fork.c
@@@ -820,15 -820,14 +820,15 @@@ static int copy_signal(unsigned long cl
        int ret;
  
        if (clone_flags & CLONE_THREAD) {
 -              ret = thread_group_cputime_clone_thread(current);
 -              if (likely(!ret)) {
 -                      atomic_inc(&current->signal->count);
 -                      atomic_inc(&current->signal->live);
 -              }
 -              return ret;
 +              atomic_inc(&current->signal->count);
 +              atomic_inc(&current->signal->live);
 +              return 0;
        }
        sig = kmem_cache_alloc(signal_cachep, GFP_KERNEL);
 +
 +      if (sig)
 +              posix_cpu_timers_init_group(sig);
 +
        tsk->signal = sig;
        if (!sig)
                return -ENOMEM;
@@@ -865,6 -864,8 +865,6 @@@
        memcpy(sig->rlim, current->signal->rlim, sizeof sig->rlim);
        task_unlock(current->group_leader);
  
 -      posix_cpu_timers_init_group(sig);
 -
        acct_init_pacct(&sig->pacct);
  
        tty_audit_fork(sig);
@@@ -1125,12 -1126,12 +1125,12 @@@ static struct task_struct *copy_process
  
        if (pid != &init_struct_pid) {
                retval = -ENOMEM;
-               pid = alloc_pid(task_active_pid_ns(p));
+               pid = alloc_pid(p->nsproxy->pid_ns);
                if (!pid)
                        goto bad_fork_cleanup_io;
  
                if (clone_flags & CLONE_NEWPID) {
-                       retval = pid_ns_prepare_proc(task_active_pid_ns(p));
+                       retval = pid_ns_prepare_proc(p->nsproxy->pid_ns);
                        if (retval < 0)
                                goto bad_fork_free_pid;
                }
@@@ -1480,12 -1481,10 +1480,10 @@@ void __init proc_caches_init(void
        fs_cachep = kmem_cache_create("fs_cache",
                        sizeof(struct fs_struct), 0,
                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
-       vm_area_cachep = kmem_cache_create("vm_area_struct",
-                       sizeof(struct vm_area_struct), 0,
-                       SLAB_PANIC, NULL);
        mm_cachep = kmem_cache_create("mm_struct",
                        sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+       mmap_init();
  }
  
  /*