--- kernel/fork.c

+++ kernel/fork.c

@@ -293,7 +293,7 @@ out:

#ifdef CONFIG_MMU

static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)

{

- struct vm_area_struct *mpnt, *tmp, **pprev;

+ struct vm_area_struct *mpnt, *tmp, *prev, **pprev;

struct rb_node **rb_link, *rb_parent;

int retval;

unsigned long charge;

@@ -321,6 +321,7 @@ static int dup_mmap(struct mm_struct *mm

if (retval)

goto out;

+ prev = NULL;

for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {

struct file *file;

@@ -349,7 +350,7 @@ static int dup_mmap(struct mm_struct *mm

vma_set_policy(tmp, pol);

tmp->vm_flags &= ~VM_LOCKED;

tmp->vm_mm = mm;

- tmp->vm_next = NULL;

+ tmp->vm_next = tmp->vm_prev = NULL;

anon_vma_link(tmp);

file = tmp->vm_file;

if (file) {

@@ -383,6 +384,8 @@ static int dup_mmap(struct mm_struct *mm

*/

*pprev = tmp;

pprev = &tmp->vm_next;

+ tmp->vm_prev = prev;

+ prev = tmp;

__vma_link_rb(mm, tmp, rb_link, rb_parent);

rb_link = &tmp->vm_rb.rb_right;

@@ -900,6 +903,9 @@ static int copy_signal(unsigned long clo

sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero;

sig->gtime = cputime_zero;

sig->cgtime = cputime_zero;

+#ifndef CONFIG_VIRT_CPU_ACCOUNTING

+ sig->prev_utime = sig->prev_stime = cputime_zero;

+#endif

sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0;

sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0;

sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0;

@@ -1243,21 +1249,6 @@ static struct task_struct *copy_process(

/* Need tasklist lock for parent etc handling! */

write_lock_irq(&tasklist_lock);

- /*

- * The task hasn't been attached yet, so its cpus_allowed mask will

- * not be changed, nor will its assigned CPU.

- *

- * The cpus_allowed mask of the parent may have changed after it was

- * copied first time - so re-copy it here, then check the child's CPU

- * to ensure it is on a valid CPU (and if not, just force it back to

- * parent's CPU). This avoids alot of nasty races.

- */

- p->cpus_allowed = current->cpus_allowed;

- p->rt.nr_cpus_allowed = current->rt.nr_cpus_allowed;

- if (unlikely(!cpu_isset(task_cpu(p), p->cpus_allowed) ||

- !cpu_online(task_cpu(p))))

- set_task_cpu(p, smp_processor_id());

-

/* CLONE_PARENT re-uses the old parent */

if (clone_flags & (CLONE_PARENT|CLONE_THREAD)) {

p->real_parent = current->real_parent;